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

diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp
index d8f1933..38d660b 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) {
@@ -216,10 +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);  
   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);