X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=OCamlDriver.cpp;h=35d03b87a9045a67a8de56330d716ed1ff8bab8a;hb=cf6d366b25132eea7b0f1966c11d034d748af0fa;hp=a57e0c6c7ab04f692aa852d8b10ba4e303935674;hpb=be1caa5c46009c13241cc48ed34a36ee2936ef87;p=SXSI%2Fxpathcomp.git

diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp
index a57e0c6..35d03b8 100644
--- a/OCamlDriver.cpp
+++ b/OCamlDriver.cpp
@@ -25,6 +25,7 @@ extern "C" {
 #include <caml/fail.h>
 #include <caml/custom.h>
 #include "results.h"
+#include <stdio.h>
 
 #define CAMLRAISEMSG(msg) (caml_raise_with_string(*cpp_exception,(msg) ))
 #define NOT_IMPLEMENTED(s)  (caml_failwith(s))
@@ -127,15 +128,15 @@ extern "C" CAMLprim value caml_xml_tree_save(value tree,value fd){
   CAMLreturn (Val_unit);
 }
 
-extern "C" CAMLprim value caml_xml_tree_load(value fd){
-  CAMLparam1(fd);
+extern "C" CAMLprim value caml_xml_tree_load(value fd, value load_tc,value sf){
+  CAMLparam3(fd,load_tc,sf);
   CAMLlocal1(doc);
   XMLTree * tree;
   try {
-  tree = XMLTree::Load(Int_val(fd));
-  doc = caml_alloc_custom(&ops,sizeof(XMLTree*),1,2);
-  memcpy(Data_custom_val(doc),&tree,sizeof(XMLTree*));
-  CAMLreturn(doc);
+    tree = XMLTree::Load(Int_val(fd),Bool_val(load_tc),Int_val(sf));
+    doc = caml_alloc_custom(&ops,sizeof(XMLTree*),1,2);
+    memcpy(Data_custom_val(doc),&tree,sizeof(XMLTree*));
+    CAMLreturn(doc);
   }
   catch (const xmlpp::internal_error& e){ CAMLRAISEMSG(e.what()); }
   catch (const std::exception& e){ CAMLRAISEMSG(e.what()); }
@@ -143,8 +144,6 @@ extern "C" CAMLprim value caml_xml_tree_load(value fd){
   catch (char const * msg){ CAMLRAISEMSG(msg);  };
 }
 
-
-
 extern "C" CAMLprim value caml_text_collection_get_text(value tree, value id){
   CAMLparam2(tree,id);
   CAMLlocal1(str);
@@ -188,13 +187,13 @@ extern "C" CAMLprim value caml_text_collection_count(value tree,value str){
 }
 bool docId_comp(DocID x, DocID y) { return x < y; };
 
+
 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);
-  //free(cstr);
   std::sort(results.begin(), results.end(), docId_comp);
   size_t s = results.size();
   resarray = caml_alloc_tuple(s);
@@ -205,12 +204,65 @@ extern "C" CAMLprim value caml_text_collection_contains(value tree,value str){
   CAMLreturn (resarray);  
 }
 
+extern "C" CAMLprim value caml_text_collection_equals(value tree,value str){
+  CAMLparam2(tree,str);
+  CAMLlocal1(resarray);
+  uchar * cstr = (uchar *) String_val(str);  
+  std::vector<DocID> results;
+  results = XMLTREE(tree)->Equal(cstr);
+  std::sort(results.begin(), results.end(), docId_comp);
+  size_t s = results.size();
+  resarray = caml_alloc_tuple(s);
+
+  for (size_t i = 0; i < s ;i++){
+    caml_initialize(&Field(resarray,i),Val_int(results[i]));
+  };
+  CAMLreturn (resarray);  
+}
+extern "C" CAMLprim value caml_text_collection_startswith(value tree,value str){
+  CAMLparam2(tree,str);
+  CAMLlocal1(resarray);
+  uchar * cstr = (uchar *) String_val(str);  
+  std::vector<DocID> results;
+  results = XMLTREE(tree)->Prefix(cstr);
+  std::sort(results.begin(), results.end(), docId_comp);
+  size_t s = results.size();
+  resarray = caml_alloc_tuple(s);
+
+  for (size_t i = 0; i < s ;i++){
+    caml_initialize(&Field(resarray,i),Val_int(results[i]));
+  };
+  CAMLreturn (resarray);  
+}
+extern "C" CAMLprim value caml_text_collection_endswith(value tree,value str){
+  CAMLparam2(tree,str);
+  CAMLlocal1(resarray);
+  uchar * cstr = (uchar *) String_val(str);  
+  std::vector<DocID> results;
+  results = XMLTREE(tree)->Suffix(cstr);
+  std::sort(results.begin(), results.end(), docId_comp);
+  size_t s = results.size();
+  resarray = caml_alloc_tuple(s);
+
+  for (size_t i = 0; i < s ;i++){
+    caml_initialize(&Field(resarray,i),Val_int(results[i]));
+  };
+  CAMLreturn (resarray);  
+}
+
+
+
 extern "C" CAMLprim value caml_text_collection_unsorted_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);
-  CAMLreturn (Val_unit);  
+  resarray = caml_alloc_tuple(results.size());
+  for (size_t i = 0; i < results.size() ;i++){
+    caml_initialize(&Field(resarray,i),Val_int(results[i]));
+  };
+  CAMLreturn (resarray);  
 }
 
 
@@ -256,7 +308,7 @@ extern "C" CAMLprim value caml_xml_tree_is_open(value tree, value id){
 }
 
 extern "C" CAMLprim value caml_xml_tree_first_element(value tree, value id){
-  return(Val_int (XMLTREE(tree)->FirstElement(TREENODEVAL(id))));
+  return(Val_int (XMLTREE(Field(tree,0))->FirstElement(TREENODEVAL(id))));
 }
 
 extern "C" CAMLprim value caml_xml_tree_tagged_child(value tree, value id, value tag){
@@ -268,7 +320,7 @@ extern "C" CAMLprim value caml_xml_tree_next_sibling(value tree, value id){
 }
 
 extern "C" CAMLprim value caml_xml_tree_next_element(value tree, value id){
-  return(Val_int (XMLTREE(tree)->NextElement(TREENODEVAL(id))));
+  return(Val_int (XMLTREE(Field(tree,0))->NextElement(TREENODEVAL(id))));
 }
 
 extern "C" CAMLprim value caml_xml_tree_tagged_sibling(value tree, value id, value tag){
@@ -291,6 +343,9 @@ extern "C" CAMLprim value caml_xml_tree_tagged_foll(value tree, value id, value
 extern "C" CAMLprim value caml_xml_tree_tagged_foll_below(value tree, value id, value tag,value root){
   return(Val_int (XMLTREE(tree)->TaggedFollBelow(TREENODEVAL(id),(TagType) Int_val(tag),TREENODEVAL(root))));
 }
+extern "C" CAMLprim value caml_xml_tree_tagged_foll_before(value tree, value id, value tag,value root){
+  return(Val_int (XMLTREE(tree)->TaggedFollBefore(TREENODEVAL(id),(TagType) Int_val(tag),TREENODEVAL(root))));
+}
 
 extern "C" CAMLprim value caml_xml_tree_my_text(value tree, value id){
   return(Val_int((XMLTREE(tree)->MyText(TREENODEVAL(id)))));
@@ -383,6 +438,11 @@ extern "C" CAMLprim value caml_xml_tree_select_foll_below(value tree, value node
 						  HSET(tags),
 						  TREENODEVAL(ctx))));
 }
+extern "C" CAMLprim value caml_xml_tree_select_foll_before(value tree, value node, value tags,value ctx){
+  return (Val_int (XMLTREE(tree)->SelectFollBelow(TREENODEVAL(node),
+						  HSET(tags),
+						  TREENODEVAL(ctx))));
+}
 
 
 extern "C" CAMLprim value caml_xml_tree_doc_ids(value tree, value node){
@@ -406,7 +466,6 @@ extern "C" value caml_result_set_create(value size){
 
 extern "C" CAMLprim value caml_result_set_set(value result,value p){
   CAMLparam1(p);
-  results r;
   setResult (  *((results*) result), Int_val(p));
   CAMLreturn (Val_unit);
 }
@@ -424,9 +483,34 @@ extern "C" CAMLprim value caml_result_set_next(value result,value p){
   CAMLreturn (Val_int(nextResult(r, Int_val(p))));
 }
 
+extern "C" CAMLprim value caml_result_set_count(value result){
+  CAMLparam0();
+  results r;
+  r = *( (results *) result);
+  CAMLreturn (Val_int(countResult(r)));
+}
+
 extern "C" CAMLprim value caml_xml_tree_print(value tree,value node,value fd){
   CAMLparam3(tree,node,fd);
   XMLTREE(tree)->Print(Int_val(fd),TREENODEVAL(node));
   CAMLreturn(Val_unit);
 }
 
+extern "C" CAMLprim value caml_set_tag_bits(value result, value tag, value tree, value node)
+{
+  CAMLparam3(tag,tree,node);
+  results r;
+  XMLTree *t = XMLTREE(Field(tree,0));
+  treeNode opening = TREENODEVAL(node);
+  treeNode closing = t->Closing(opening);
+  TagType target_tag = Int_val(tag);
+  treeNode first = t->TaggedDesc(opening,target_tag);
+  r = *( (results *) result);
+  opening = first;
+  while (opening != NULLT){
+    setResult(r,opening);
+    opening = t->TaggedFollBefore(opening,target_tag,closing);
+  };
+  CAMLreturn(Val_int(first));
+}
+