.

[SXSI/xpathcomp.git] / main.ml

diff --git a/main.ml b/main.ml
index ba93328..8b2bc46 100644 (file)
--- a/main.ml
+++ b/main.ml
@@ -6,7 +6,7 @@
 (******************************************************************************)
 INCLUDE "debug.ml"
 
-open Automaton
+open Ata
 
 
 let l = ref [] ;;
@@ -22,14 +22,8 @@ let time f x =
 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
+let main v query output =
     let _ = Tag.init (Tree.Binary.tag_pool v) in
-      MM(v,__LOCATION__);
       Printf.eprintf "Parsing query : ";    
       let query = try
        time
@@ -40,38 +34,55 @@ let main filename query output =
        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_char oc '\n') auto.result) ();
-       end;
-       Printf.eprintf "Total time : %fms\n Coherence : %i\n%!" (total_time())
+         let result = time (BottomUpNew.run auto) v in
+           Printf.eprintf "Number of nodes in the result set : %i\n" (List.length 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";
+                             List.iter (fun t -> Tree.Binary.print_xml_fast oc t;
+                                          output_char oc '\n') 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();;
 
-main Sys.argv.(1) Sys.argv.(2) (if argc == 4 then Some Sys.argv.(3) else None) ;; 
+let v = 
+  if (Filename.check_suffix !Options.input_file ".srx")
+  then 
+    begin
+      Printf.eprintf "Loading from file : ";
+      time (Tree.Binary.load  ~sample:!Options.sample_factor )
+       (Filename.chop_suffix !Options.input_file ".srx");
+    end
+  else 
+    let v = 
+      time (fun () -> let v = Tree.Binary.parse_xml_uri !Options.input_file;
+           in Printf.eprintf "Parsing document : %!";v
+          ) () 
+    in
+      if !Options.save_file <> ""
+      then begin
+       Printf.eprintf "Writing file to disk : ";
+       time (Tree.Binary.save v) !Options.save_file;
+      end;
+      v
+in
+  main v !Options.query !Options.output_file;;
 
+IFDEF DEBUG
+THEN
 Printf.eprintf "\n=================================================\nDEBUGGING\n%!";
+Format.eprintf "\nAutomaton is:\n%!";
+Ata.dump Format.err_formatter auto;
 Tree.DEBUGTREE.print_stats Format.err_formatter;;
-
-
+Gc.full_major()
+ENDIF