X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=main.ml;h=217b2e2ab01e21832ed68267353f5f74ffaeec17;hb=7a84508ebd7b534215a768c771171e8f062e0d0b;hp=10fd9158570116ddabe99ac2c0aaf728ebce9b19;hpb=705a37f90b2161deaae7d99cc6c95700613e2cb2;p=SXSI%2Fxpathcomp.git

diff --git a/main.ml b/main.ml
index 10fd915..217b2e2 100644
--- a/main.ml
+++ b/main.ml
@@ -7,7 +7,7 @@
 INCLUDE "debug.ml"
 
 open Automaton
-let a = ref None
+
 
 let l = ref [] ;;
 let time f x =
@@ -21,58 +21,53 @@ let time f x =
 ;;
 let total_time () =  List.fold_left (+.) 0. !l;;
 
-let test filename query output = 
-  Printf.eprintf "Parsing document : %!";
-  let v = time Tree.Binary.parse_xml_uri filename in
-  Tree.Binary.print_xml_fast stderr v
-
 
 let main filename query output =
-  Printf.eprintf "Parsing document : %!";
-  let v = time Tree.Binary.parse_xml_uri filename in
-    MM(v,__LOCATION__);
-    a := Some (v);
-    a := None;
-    Tree.Binary.print_xml_fast stderr v;
-    Printf.eprintf "Parsing query : ";    
-    let query = try
-      time
-	XPath.Parser.parse_string query
-    with
-	Ulexer.Loc.Exc_located ((x,y),e) -> Printf.eprintf "character %i-%i %s\n" x y (Printexc.to_string e);exit 1
+    (* Just a trick to allow the C++ code to print debugging stuff first *)  
+    let v = time (fun () -> let v = Tree.Binary.parse_xml_uri filename;
+		  in Printf.eprintf "Parsing document : %!";v
+		 ) () 
     in
-      Printf.eprintf "Compiling query : ";
-      let auto = time XPath.Compile.compile  query in
-	XPath.Ast.print Format.err_formatter query;
-	Format.eprintf "\n%!";
-
-	Printf.eprintf "TopDown (No BackTrack) : \n";
-	time (fun v -> ignore (TopDown.accept auto v)) v;
-	P(Printf.eprintf "Max states in TopDownNOBT : %i\n%!" auto.max_states);
-	begin
-	  match output with
-	    | None -> ()
-	    | Some f ->
-		
-		Printf.eprintf "Serializing results : ";
+    let _ = Tag.init (Tree.Binary.tag_pool v) in
+      Printf.eprintf "Parsing query : ";    
+      let query = try
+	time
+	  XPath.Parser.parse_string query
+      with
+	  Ulexer.Loc.Exc_located ((x,y),e) -> Printf.eprintf "character %i-%i %s\n" x y (Printexc.to_string e);exit 1
+      in      
+	Printf.eprintf "Compiling query : ";
+	let auto = time XPath.Compile.compile  query in
+	  XPath.Ast.print Format.err_formatter query;
+	  Format.eprintf "\n%!";
+	  (*		Format.eprintf "Internal rep of the tree is :\n%!";
+			Tree.Binary.dump v;			      *)
+	  Printf.eprintf "Execution time : ";
+	  time (fun v -> ignore (TopDown.accept auto v)) v;
+	  Printf.eprintf "Number of nodes in the result set : %i\n" (BST.cardinal auto.result);
+	  begin
+ 	    match output with
+	      | None -> ()
+	      | Some f ->
+		  
+		  Printf.eprintf "Serializing results : ";
 		time( fun () ->
 			let oc = open_out f in
 			  output_string oc "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 			  BST.iter (fun t -> Tree.Binary.print_xml_fast oc t;
-				      output_string oc "\n------------------";
-				    output_char oc '\n') auto.result) ();
+				      output_char oc '\n') auto.result) ();
 	end;
 	Printf.eprintf "Total time : %fms\n Coherence : %i\n%!" (total_time())
 ;;
 		
 
-let argc = Array.length Sys.argv;;
-if (argc < 3 || argc >4)
-then
-  (prerr_endline ("usage : " ^ Sys.argv.(0) ^ " <document> \'query\'[ <output> ]");
-   exit 1)
-;;
-
+Options.parse_cmdline();;
 
-test Sys.argv.(1) Sys.argv.(2) (if argc == 4 then Some Sys.argv.(3) else None) ;; 
+main !Options.input_file !Options.query !Options.output_file;;
 
+IFDEF DEBUG
+THEN
+Printf.eprintf "\n=================================================\nDEBUGGING\n%!";
+Tree.DEBUGTREE.print_stats Format.err_formatter;;
+Gc.full_major()
+ENDIF