X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=tree.ml;h=3bfbfceeac181d6976aba24b50b3f8da1b0cc83c;hb=63ca35af9ef5c0b18b3d3217536f3353f77f5465;hp=1b4ce2ecb26d79d1377b652d207173de8d63d508;hpb=c10ce35cd399aff15a49f3b24a31b38cb2191da0;p=SXSI%2Fxpathcomp.git

diff --git a/tree.ml b/tree.ml
index 1b4ce2e..3bfbfce 100644
--- a/tree.ml
+++ b/tree.ml
@@ -4,6 +4,7 @@
 (*  Copyright NICTA 2008                                                      *)
 (*  Distributed under the terms of the LGPL (see LICENCE)                     *)
 (******************************************************************************)
+INCLUDE "debug.ml"
 module type BINARY =
 sig
   type node_content
@@ -44,12 +45,11 @@ struct
     
   external int_of_node : 'a node -> int = "%identity"
 
-  external parse_xml_uri : string  -> t = "caml_call_shredder_uri"
-  let parse_xml_uri uri = parse_xml_uri uri
-    
-  external parse_xml_string :  string  -> t = "caml_call_shredder_string"
-  let parse_xml_string uri = parse_xml_string uri
+  external parse_xml_uri : string -> int -> bool -> bool -> t = "caml_call_shredder_uri"
+       
     
+  external parse_xml_string :  string -> int -> bool -> bool -> t = "caml_call_shredder_string"
+
 
   module Text =
   struct
@@ -178,8 +178,17 @@ struct
 			node = Node(NC (root t)) }
 
 
-    let parse_xml_uri str = node_of_t (parse_xml_uri str)
-    let parse_xml_string str = node_of_t (parse_xml_string str)
+    let parse_xml_uri str = node_of_t       
+      (MM((parse_xml_uri str 
+	     !Options.sample_factor 
+	     !Options.index_empty_texts
+	     !Options.disable_text_collection),__LOCATION__))
+
+    let parse_xml_string str = node_of_t 
+      (MM((parse_xml_string str
+	 !Options.sample_factor 
+	 !Options.index_empty_texts 
+	 !Options.disable_text_collection),__LOCATION__))
 
 
     external pool : doc -> Tag.pool = "%identity"
@@ -372,14 +381,16 @@ struct
 	    aux (first_child n);
 	    aux (next_sibling n)
       in aux t
+
+    let print_stats _ = ()
   end
 
 end
 
 
 
-
-
+IFDEF DEBUG
+THEN
 module DEBUGTREE 
   = struct
     
@@ -566,3 +577,6 @@ module DEBUGTREE
 end
 
 module Binary = DEBUGTREE
+ELSE
+module Binary = XML.Binary
+END (* IFDEF DEBUG *)