X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=OCamlDriver.cpp;h=e3b5f445c26efb890aac5c3e8c3932cdc7da6e86;hb=f84dd2f6de7d5da16da729dc2e91cbdeb3585d75;hp=d8f1933bbdd20b8be0f2b04ede7b0fc86dab6e47;hpb=b821684aac2e3114c2eb28188020d7a09b5de2a5;p=SXSI%2Fxpathcomp.git

diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp
index d8f1933..e3b5f44 100644
--- a/OCamlDriver.cpp
+++ b/OCamlDriver.cpp
@@ -15,6 +15,9 @@ extern "C" {
 #include <caml/memory.h>
 #include <caml/callback.h>
 #include <caml/fail.h>
+#include <caml/custom.h>
+  
+
 } //extern C
 
 //#include "TextCollection/TextCollection.h"
@@ -24,21 +27,42 @@ extern "C" {
 
 #define CAMLRAISECPP(e) (caml_failwith( ((e).what())))
 #define NOT_IMPLEMENTED(s)  (caml_failwith(s))
-#define XMLTREE(x) ((XMLTree *)(x))
+#define XMLTREE(x) ((XMLTree *)(* (XMLTree**) Data_custom_val(x)))
 #define TEXTCOLLECTION(x)
 #define TREENODEVAL(i) ((treeNode) (Int_val(i)))
 
-extern "C" CAMLprim value caml_call_shredder_uri(value uri){
+extern "C" {
+  static struct custom_operations ops;
+  static bool initialized = false;
+}
+extern "C" void caml_xml_tree_finalize(value tree){
+  delete XMLTREE(tree);
+  return;
+}
+
+extern "C" void caml_init_ops () {
+
+  if (initialized)
+    return; 
+  ops.identifier = (char*) "XMLTree";
+  ops.finalize = caml_xml_tree_finalize;
+  return;
+}
+
+extern "C" CAMLprim value caml_call_shredder_uri(value uri,value sf, value iet, value dtc){
   CAMLparam1(uri);
   CAMLlocal1(doc);
   char *fn = String_val(uri);
   try {
-  XMLDocShredder shredder(fn);  
+    XMLDocShredder shredder(fn,Int_val(sf),Bool_val(iet),Bool_val(dtc));
+  XMLTree * tree;
   shredder.processStartDocument(fn);  
   shredder.parse();  
   shredder.processEndDocument();
-  doc = (value) shredder.storageIfc_->returnDocument();
-
+  caml_init_ops();
+  doc = caml_alloc_custom(&ops,sizeof(XMLTree*),1,2);
+  tree = (XMLTree *) shredder.storageIfc_->returnDocument();
+  memcpy(Data_custom_val(doc),&tree,sizeof(XMLTree*));
   CAMLreturn(doc);
   }
   catch (const std::exception& e){
@@ -47,19 +71,22 @@ extern "C" CAMLprim value caml_call_shredder_uri(value uri){
   
 }
 
-extern "C" CAMLprim value caml_call_shredder_string(value data){
+extern "C" CAMLprim value caml_call_shredder_string(value data,value sf, value iet, value dtc){
   CAMLparam1(data);
   CAMLlocal1(doc);
   unsigned int ln = string_length(data);
   unsigned char *fn = (unsigned char*) String_val(data);
   
   try {
-    XMLDocShredder shredder(fn,ln);  
+    XMLDocShredder shredder(fn,ln,Int_val(sf),Bool_val(iet),Bool_val(dtc));  
+    XMLTree* tree;
     shredder.processStartDocument("");  
     shredder.parse();  
     shredder.processEndDocument();
-    doc = (value) shredder.storageIfc_->returnDocument();
-    
+    caml_init_ops();
+    doc = caml_alloc_custom(&ops,sizeof(XMLTree*),1,2);
+    tree = (XMLTree *) shredder.storageIfc_->returnDocument();
+    memcpy(Data_custom_val(doc),&tree,sizeof(XMLTree*));
     CAMLreturn(doc);
   }
   catch (const std::exception& e) {
@@ -98,9 +125,12 @@ extern "C" CAMLprim value caml_cpp_traversal(value tree){
 }
 
 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));
+  CAMLparam2(tree,id);
+  CAMLlocal1(str);
+  uchar* txt = XMLTREE(tree)->GetText((DocID) Int_val(id));
+  str = caml_copy_string((const char*)txt);
+  delete (txt);
+  CAMLreturn (str);
 }
 extern "C" CAMLprim value caml_text_collection_empty_text(value tree,value id){
   CAMLparam2(tree,id);
@@ -126,7 +156,7 @@ extern "C" CAMLprim value caml_text_collection_contains(value tree,value str){
   uchar * cstr = (uchar *) String_val(str);  
   std::vector<DocID> results;
   results = XMLTREE(tree)->Contains(cstr);
-
+  //free(cstr);
   resarray = caml_alloc_tuple(results.size());
 
   for (unsigned int i=0; i<results.size();i++){
@@ -150,7 +180,7 @@ extern "C" CAMLprim value caml_xml_tree_parent(value tree, value 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))));
+  CAMLreturn(Val_int (XMLTREE(tree)->ParentNode((DocID) Int_val(id))));
 }
 
 extern "C" CAMLprim value caml_xml_tree_is_ancestor(value tree,value id1, value id2) {
@@ -209,18 +239,49 @@ extern "C" CAMLprim value caml_xml_tree_node_xml_id(value tree, value id){
   CAMLparam2(tree,id);
   CAMLreturn(Val_int((XMLTREE(tree)->NodeXMLId(TREENODEVAL(id)))));
 }
-extern "C" CAMLprim value caml_xml_tree_tag(value tree, value id){
-  CAMLparam2(tree,id);
-  const char* tag;
-  tag =(const char*) XMLTREE(tree)->GetTagName(XMLTREE(tree)->Tag(TREENODEVAL(id)));
 
-  CAMLreturn (caml_copy_string(tag));
+extern "C" CAMLprim value caml_xml_tree_tag_name(value tree, value tagid){
+  CAMLparam2(tree,tagid);
+  CAMLlocal1(str);
+  char* tag;
+  tag = (char*) XMLTREE(tree)->GetTagNameByRef((TagType) (Int_val(tagid)));
+  str = caml_copy_string((const char*) tag);
+  CAMLreturn (str);
 }
+
+
 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_register_tag(value tree,value str){
+  CAMLparam2(tree,str);
+  CAMLlocal1(id);
+  unsigned char* tag;
+  tag = (unsigned char*) (String_val(str));
+  id = Val_int(XMLTREE(tree)->RegisterTag(tag));
+  CAMLreturn (id);
+}
+
 extern "C" CAMLprim value caml_xml_tree_nullt(value unit){
   CAMLparam1(unit);
   CAMLreturn (NULLT);
 }
+
+extern "C" CAMLprim value caml_xml_tree_save(value tree,value filename){
+  CAMLparam2(tree,filename);
+  XMLTREE(tree)->Save((unsigned char *) String_val(filename));
+  CAMLreturn (Val_unit);
+}
+
+extern "C" CAMLprim value caml_xml_tree_load(value filename,value samplerate){
+  CAMLparam2(filename,samplerate);
+  CAMLlocal1(doc);
+  XMLTree * tree;
+  tree = XMLTree::Load((unsigned char *) String_val(filename),Int_val(samplerate));
+  caml_init_ops();
+  doc = caml_alloc_custom(&ops,sizeof(XMLTree*),1,2);
+  memcpy(Data_custom_val(doc),&tree,sizeof(XMLTree*));
+  CAMLreturn(doc);
+}