X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=OCamlDriver.cpp;h=38d660b13f4cad84e49287e3b14e9e6c8f588e51;hb=63ca35af9ef5c0b18b3d3217536f3353f77f5465;hp=636a95280c79e6170ea21290e05d0d10b100c4f2;hpb=24fdea81b5506233d139bd7d72364a190bef35b8;p=SXSI%2Fxpathcomp.git

diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp
index 636a952..38d660b 100644
--- a/OCamlDriver.cpp
+++ b/OCamlDriver.cpp
@@ -15,30 +15,54 @@ extern "C" {
 #include <caml/memory.h>
 #include <caml/callback.h>
 #include <caml/fail.h>
+#include <caml/custom.h>
+  
+
 } //extern C
 
-#include "TextCollection/TextCollection.h"
+//#include "TextCollection/TextCollection.h"
 #include "XMLDocShredder.h"
 #include "XMLTree.h"
 #include "Utils.h"
 
 #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) {
@@ -71,7 +98,7 @@ void traversal_rec(XMLTree* tree, treeNode id){
  DocID tid; 
   if (id == NULLT)
     return;
-  int tag = tree->Tag(id);
+  //  int tag = tree->Tag(id);
    if (id) {
         tid = tree->PrevText(id);
 	char * data = (char *) (tree->getTextCollection())->GetText(tid);
@@ -97,41 +124,39 @@ extern "C" CAMLprim value caml_cpp_traversal(value tree){
   CAMLreturn(Val_unit);
 }
 
-
-extern "C" CAMLprim value caml_text_collection_get_text(value tc, value id){
-  CAMLparam2(tc,id);
-  
-  const char* txt = (const char*) ((TextCollection*) tc)->GetText((DocID) Int_val(id)); 
+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 tc,value id){
-  CAMLparam2(tc,id);
-  CAMLreturn ( Val_int(((TextCollection*) tc)->EmptyText((DocID) Int_val(id))));
+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 tc,value str){
-  CAMLparam2(tc,str);
+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) ((TextCollection*) tc)->IsContains(cstr)));
+  CAMLreturn ( Val_bool((int) XMLTREE(tree)->IsContains(cstr)));
 }
 
-extern "C" CAMLprim value caml_text_collection_count_contains(value tc,value str){
-  CAMLparam2(tc,str);
+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(((TextCollection*) tc)->CountContains(cstr)));
+  CAMLreturn (Val_int((XMLTREE(tree)->CountContains(cstr))));
   
 }
 
-extern "C" CAMLprim value caml_text_collection_contains(value tc,value str){
-  CAMLparam2(tc,str);
+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 = ((TextCollection*) tc)->Contains(cstr);
+  results = XMLTREE(tree)->Contains(cstr);
 
   resarray = caml_alloc_tuple(results.size());
 
-  for (int i=0; i<results.size();i++){
+  for (unsigned int i=0; i<results.size();i++){
     caml_initialize(&Field(resarray,i),Val_int(results[i]));
   };
   CAMLreturn (resarray);  
@@ -218,13 +243,30 @@ 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_name(value tree, value tagid){
+  CAMLparam2(tree,tagid);
+  const char* tag;
+  tag = (const char*) XMLTREE(tree)->GetTagName((TagType) (Int_val(tagid)));
+
+  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));
+  CAMLparam2(tree,id);  
+  CAMLreturn (Val_int(XMLTREE(tree)->Tag(TREENODEVAL(id))));
+}
 
-  CAMLreturn (Val_unit);
+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);