X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=main.ml;h=021a18e935bc2b1886aab07cbaec018aa2b65ac5;hb=04639fe524ee20f7f84c8b08387312d714c9bd56;hp=ce37dfc0c587378e6e0dd25fa1743f3afd432d8b;hpb=82361b41bedcd7726f2601111a9591318079a120;p=SXSI%2Fxpathcomp.git

diff --git a/main.ml b/main.ml
index ce37dfc..021a18e 100644
--- a/main.ml
+++ b/main.ml
@@ -4,7 +4,6 @@
 (*  Copyright NICTA 2008                                                      *)
 (*  Distributed under the terms of the LGPL (see LICENCE)                     *)
 (******************************************************************************)
-INCLUDE "debug.ml"
 
 open Ata
 
@@ -24,19 +23,19 @@ let disabled_gc = { Gc.get() with
 		      Gc.max_overhead = 1000000; 
 		      Gc.space_overhead = 100 }
 
-let main v query output =
+let main v query_string output =
     let _ = Tag.init (Tree.tag_pool v) in
       Printf.eprintf "Parsing query : ";    
       let query = try
 	time
-	  XPath.Parser.parse_string query
+	  XPath.Parser.parse_string query_string
       with
 	  Ulexer.Loc.Exc_located ((x,y),e) -> Printf.eprintf "character %i-%i %s\n" x y (Printexc.to_string e);exit 1
       in
 	XPath.Ast.print Format.err_formatter query;
 	Format.fprintf Format.err_formatter "\n%!";
 	Printf.eprintf "Compiling query : ";
-	let auto,ltags,contains = time XPath.Compile.compile  query in 
+	let auto,ltags,contains = time (XPath.Compile.compile ~querystring:query_string) query in 
 	let _ = Ata.dump Format.err_formatter auto in
 	let _ = Printf.eprintf "%!" in
 	let jump_to =
@@ -61,7 +60,7 @@ let main v query output =
 	    Printf.eprintf "Finding min occurences : ";
 	    time 
 	      ( List.fold_left (fun ((min_occ,kind)as acc)  (tag,_) ->
-			      let numtags = Tree.subtree_tags v tag in
+			      let numtags = Tree.subtree_tags v tag Tree.root in
 				if  ((numtags < min_occ) && numtags >= 2)
 				then (numtags,`TAG(tag))
 				else acc) jump_to) ltags
@@ -80,6 +79,7 @@ let main v query output =
 	    (if !Options.count_only then "(counting only)" else if !Options.backward then "(bottomup)" else "");
 	  begin
 	    let _ = Gc.full_major();Gc.compact() in
+	    let _ = Printf.eprintf "%!" in
 	      (*	    let _ = Gc.set (disabled_gc) in  *)
 	      if !Options.backward && ((snd test_list) != `NOTHING )then 
 		
@@ -108,9 +108,9 @@ let main v query output =
 				    let oc = open_out f in
 				      output_string oc "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";				
 				      IdSet.iter (fun t -> 
-						    Tree.print_xml_fast oc t;
+						    Tree.print_xml_fast oc v t;
 						    output_char oc '\n';
-						    output_string oc "----------\n";
+
 						 ) result) ();
 		    end;
 	  end;
@@ -126,7 +126,7 @@ let v =
     begin
       Printf.eprintf "Loading from file : ";
       time (Tree.load  ~sample:!Options.sample_factor )
-    (Filename.chop_suffix !Options.input_file ".srx");
+	!Options.input_file;
 	end
   else 
     let v = 
@@ -143,10 +143,3 @@ let v =
 in
   main v !Options.query !Options.output_file;;
 
-IFDEF DEBUG
-THEN
-Printf.eprintf "\n=================================================\nDEBUGGING\n%!";
-
-Tree.DEBUGTREE.print_stats Format.err_formatter;;
-Gc.full_major()
-ENDIF