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

diff --git a/main.ml b/main.ml
index 48f81bd..217b2e2 100644
--- a/main.ml
+++ b/main.ml
@@ -23,13 +23,12 @@ let total_time () =  List.fold_left (+.) 0. !l;;
 
 
 let main filename query output =
-
     (* 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
-      MM(v,__LOCATION__);
+    let _ = Tag.init (Tree.Binary.tag_pool v) in
       Printf.eprintf "Parsing query : ";    
       let query = try
 	time
@@ -61,17 +60,14 @@ let main filename query output =
 	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();;
 
-main 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