- Removed the direct calls to TextCollection, use XMLTree wrapper instead

[SXSI/xpathcomp.git] / OCamlDriver.cpp

diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp
index 1c50a7b..d8f1933 100644 (file)
--- a/OCamlDriver.cpp
+++ b/OCamlDriver.cpp
@@ -17,9 +17,9 @@ extern "C" {
 #include <caml/fail.h>
 } //extern C
 
+//#include "TextCollection/TextCollection.h"
 #include "XMLDocShredder.h"
 #include "XMLTree.h"
-#include "TextCollection/TextCollection.h"
 #include "Utils.h"
 
 #define CAMLRAISECPP(e) (caml_failwith( ((e).what())))
@@ -67,12 +67,74 @@ extern "C" CAMLprim value caml_call_shredder_string(value data){
   };
 }
 
-extern "C" CAMLprim value caml_text_collection_get_text(value tc, value id){
-  CAMLparam2(tc,id);
+void traversal_rec(XMLTree* tree, treeNode id){
+ DocID tid; 
+  if (id == NULLT)
+    return;
+  //  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);
+       };
   
-  const char* txt = (const char*) ((TextCollection*) tc)->GetText((DocID) Int_val(id)); 
+       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;
+}
+
+extern "C" CAMLprim value caml_cpp_traversal(value tree){
+  CAMLparam1(tree);
+  traversal_rec(XMLTREE(tree),XMLTREE(tree)->Root());
+  CAMLreturn(Val_unit);
+}
+
+extern "C" CAMLprim value caml_text_collection_get_text(value tree, value id){
+  CAMLparam2(tree,id);  
+  const char* txt = (const char*) (XMLTREE(tree)->GetText((DocID) Int_val(id))); 
   CAMLreturn (caml_copy_string(txt));
 }
+extern "C" CAMLprim value caml_text_collection_empty_text(value tree,value id){
+  CAMLparam2(tree,id);
+  CAMLreturn ( Val_int((XMLTREE(tree))->EmptyText((DocID) Int_val(id))));
+}
+
+extern "C" CAMLprim value caml_text_collection_is_contains(value tree,value str){
+  CAMLparam2(tree,str);
+  uchar * cstr = (uchar *) String_val(str);  
+  CAMLreturn ( Val_bool((int) XMLTREE(tree)->IsContains(cstr)));
+}
+
+extern "C" CAMLprim value caml_text_collection_count_contains(value tree,value str){
+  CAMLparam2(tree,str);
+  uchar * cstr = (uchar *) String_val(str);  
+  CAMLreturn (Val_int((XMLTREE(tree)->CountContains(cstr))));
+  
+}
+
+extern "C" CAMLprim value caml_text_collection_contains(value tree,value str){
+  CAMLparam2(tree,str);
+  CAMLlocal1(resarray);
+  uchar * cstr = (uchar *) String_val(str);  
+  std::vector<DocID> results;
+  results = XMLTREE(tree)->Contains(cstr);
+
+  resarray = caml_alloc_tuple(results.size());
+
+  for (unsigned 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);
@@ -80,19 +142,45 @@ extern "C" CAMLprim value caml_xml_tree_root(value tree){
 }
 extern "C" CAMLprim value caml_xml_tree_text_collection(value tree){
   CAMLparam1(tree);
-  CAMLreturn((value) XMLTREE(tree)->GetTextCollection());
+  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);
-  CAMLlocal1(res);
-  DPRINT("BEFORE!!!");
-  DPRINT(XMLTREE(tree)->flag);
-  DPRINT("ID is " << Int_val(id));
-  res = Val_int (XMLTREE(tree)->FirstChild(TREENODEVAL(id)));
-  DPRINT("AFTER!!!" << Int_val(res));
-  CAMLreturn(res);
+  CAMLreturn(Val_int (XMLTREE(tree)->FirstChild(TREENODEVAL(id))));
+}
+
+extern "C" CAMLprim value caml_xml_tree_is_leaf(value tree, value id){
+  CAMLparam2(tree,id);
+  CAMLreturn(Val_bool (XMLTREE(tree)->IsLeaf(TREENODEVAL(id))));
 }
+
 extern "C" CAMLprim value caml_xml_tree_next_sibling(value tree, value id){
   CAMLparam2(tree,id);
   CAMLreturn(Val_int (XMLTREE(tree)->NextSibling(TREENODEVAL(id))));
@@ -101,8 +189,7 @@ extern "C" CAMLprim value caml_xml_tree_next_sibling(value tree, value id){
 extern "C" CAMLprim value caml_xml_tree_prev_text(value tree, value id){
   CAMLparam2(tree,id);
   CAMLlocal1(res);
-  res = Val_int((XMLTREE(tree)->PrevText(TREENODEVAL(id))));
-  cerr << "AFTER PREV TEXT" << Int_val(res);
+  CAMLreturn(Val_int((XMLTREE(tree)->PrevText(TREENODEVAL(id)))));
   CAMLreturn(res);
 }
 extern "C" CAMLprim value caml_xml_tree_next_text(value tree, value id){
@@ -116,15 +203,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);
@@ -133,6 +216,10 @@ 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);  
+  CAMLreturn (Val_int(XMLTREE(tree)->Tag(TREENODEVAL(id))));
+}
 extern "C" CAMLprim value caml_xml_tree_nullt(value unit){
   CAMLparam1(unit);
   CAMLreturn (NULLT);