X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=OCamlDriver.cpp;h=636a95280c79e6170ea21290e05d0d10b100c4f2;hb=04630ec1de987f525c6594fcada17bb49ee79d6a;hp=490e007bf1fc4ecd36d691ed125d213cc5b22664;hpb=496df5f7d3e6f8271763314f2067719cc2904c71;p=SXSI%2Fxpathcomp.git

diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp
index 490e007..636a952 100644
--- a/OCamlDriver.cpp
+++ b/OCamlDriver.cpp
@@ -68,36 +68,32 @@ extern "C" CAMLprim value caml_call_shredder_string(value data){
 }
 
 void traversal_rec(XMLTree* tree, treeNode id){
+ DocID tid; 
   if (id == NULLT)
     return;
-  char * tag = (char*)tree->GetTagName(tree->Tag(id));
-  if (id) {
-  DocID tid = tree->PrevText(id);
-  char * data = (char *) (tree->getTextCollection())->GetText(tid);
-  if (tree->IsLeaf(id)){
-    tid = tree->MyText(id);
-    data = (char*) (tree->getTextCollection())->GetText(tid);
-  };
+  int tag = tree->Tag(id);
+   if (id) {
+        tid = tree->PrevText(id);
+	char * data = (char *) (tree->getTextCollection())->GetText(tid);
+	if (tree->IsLeaf(id)){
+	  tid = tree->MyText(id);
+
+	  data = (char*) (tree->getTextCollection())->GetText(tid);
+	};
   
-  if (tree->NextSibling(id) == NULLT){
-    tid = tree->NextText(id);
-    data = (char*) (tree->getTextCollection())->GetText(tid);
-  };
-    }
-  traversal_rec(tree,tree->FirstChild(id));
-  traversal_rec(tree,tree->NextSibling(id));
-  return;
+	if (tree->NextSibling(id) == NULLT){
+	  tid = tree->NextText(id);
+	  data = (char*) (tree->getTextCollection())->GetText(tid);
+	}; 
+   };
+   traversal_rec(tree,tree->FirstChild(id));
+   traversal_rec(tree,tree->NextSibling(id));
+   return;
 }
 
-void traversal (XMLTree* tree){ 
-  traversal_rec(tree, tree->Root());
-  return;
-}
-
-
 extern "C" CAMLprim value caml_cpp_traversal(value tree){
   CAMLparam1(tree);
-  traversal(XMLTREE(tree));
+  traversal_rec(XMLTREE(tree),XMLTREE(tree)->Root());
   CAMLreturn(Val_unit);
 }
 
@@ -113,6 +109,35 @@ extern "C" CAMLprim value caml_text_collection_empty_text(value tc,value id){
   CAMLreturn ( Val_int(((TextCollection*) tc)->EmptyText((DocID) Int_val(id))));
 }
 
+extern "C" CAMLprim value caml_text_collection_is_contains(value tc,value str){
+  CAMLparam2(tc,str);
+  uchar * cstr = (uchar *) String_val(str);  
+  CAMLreturn ( Val_bool((int) ((TextCollection*) tc)->IsContains(cstr)));
+}
+
+extern "C" CAMLprim value caml_text_collection_count_contains(value tc,value str){
+  CAMLparam2(tc,str);
+  uchar * cstr = (uchar *) String_val(str);  
+  CAMLreturn ( Val_int(((TextCollection*) tc)->CountContains(cstr)));
+  
+}
+
+extern "C" CAMLprim value caml_text_collection_contains(value tc,value str){
+  CAMLparam2(tc,str);
+  CAMLlocal1(resarray);
+  uchar * cstr = (uchar *) String_val(str);  
+  std::vector<DocID> results;
+  results = ((TextCollection*) tc)->Contains(cstr);
+
+  resarray = caml_alloc_tuple(results.size());
+
+  for (int i=0; i<results.size();i++){
+    caml_initialize(&Field(resarray,i),Val_int(results[i]));
+  };
+  CAMLreturn (resarray);  
+}
+
+
 extern "C" CAMLprim value caml_xml_tree_root(value tree){
   CAMLparam1(tree);
   CAMLreturn (TREENODEVAL(XMLTREE(tree)->Root()));
@@ -121,6 +146,32 @@ extern "C" CAMLprim value caml_xml_tree_text_collection(value tree){
   CAMLparam1(tree);
   CAMLreturn((value) XMLTREE(tree)->getTextCollection());
 }
+extern "C" CAMLprim value caml_xml_tree_parent(value tree, value id){
+  CAMLparam2(tree,id);
+  CAMLreturn(Val_int (XMLTREE(tree)->Parent(TREENODEVAL(id))));
+}
+extern "C" CAMLprim value caml_xml_tree_parent_doc(value tree, value id){
+  CAMLparam2(tree,id);
+  CAMLreturn(Val_int (XMLTREE(tree)->ParentNode(TREENODEVAL(id))));
+}
+
+extern "C" CAMLprim value caml_xml_tree_is_ancestor(value tree,value id1, value id2) {
+  CAMLparam3(tree,id1,id2);
+  CAMLreturn(Val_bool (XMLTREE(tree)->IsAncestor(TREENODEVAL(id1),TREENODEVAL(id2))));
+}
+
+extern "C" CAMLprim value caml_xml_tree_serialize(value tree, value filename){
+  CAMLparam2(tree,filename);
+  NOT_IMPLEMENTED("caml_xml_tree_serialize");
+  CAMLreturn(Val_unit);
+}
+
+extern "C" CAMLprim value caml_xml_tree_unserialize(value filename){
+  CAMLparam1(filename);
+  NOT_IMPLEMENTED("caml_xml_tree_unserialize");
+  CAMLreturn(Val_unit);
+}
+
 
 extern "C" CAMLprim value caml_xml_tree_first_child(value tree, value id){
   CAMLparam2(tree,id);
@@ -154,15 +205,11 @@ extern "C" CAMLprim value caml_xml_tree_my_text(value tree, value id){
 
 extern "C" CAMLprim value caml_xml_tree_text_xml_id(value tree, value id){
   CAMLparam2(tree,id);
-
-  NOT_IMPLEMENTED("caml_xml_tree_text_xml_id");
-  CAMLreturn (Val_unit);
+  CAMLreturn(Val_int((XMLTREE(tree)->TextXMLId(TREENODEVAL(id)))));
 }
 extern "C" CAMLprim value caml_xml_tree_node_xml_id(value tree, value id){
   CAMLparam2(tree,id);
-
-  NOT_IMPLEMENTED("caml_xml_tree_node_xml_id");
-  CAMLreturn (Val_unit);
+  CAMLreturn(Val_int((XMLTREE(tree)->NodeXMLId(TREENODEVAL(id)))));
 }
 extern "C" CAMLprim value caml_xml_tree_tag(value tree, value id){
   CAMLparam2(tree,id);
@@ -171,6 +218,13 @@ extern "C" CAMLprim value caml_xml_tree_tag(value tree, value id){
 
   CAMLreturn (caml_copy_string(tag));
 }
+extern "C" CAMLprim value caml_xml_tree_tag_id(value tree,value id){
+  CAMLparam2(tree,id);
+  
+  int tag =XMLTREE(tree)->Tag(TREENODEVAL(id));
+
+  CAMLreturn (Val_unit);
+}
 extern "C" CAMLprim value caml_xml_tree_nullt(value unit){
   CAMLparam1(unit);
   CAMLreturn (NULLT);