.

[SXSI/xpathcomp.git] / main.ml

diff --git a/main.ml b/main.ml
index 4e12ae8..c9885e6 100644 (file)
--- a/main.ml
+++ b/main.ml
@@ -38,7 +38,7 @@ let main v query_string output =
        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 =
+       let jump_to = 
          match contains with
              None -> (max_int,`NOTHING)
            | Some s -> 
@@ -55,18 +55,20 @@ let main v query_string output =
                    time (Tree.init_naive_contains v) s
                  end;(r,`CONTAINS(s))
        in
+       let test_list = jump_to in
+       (*
        let test_list = 
          if (!Options.backward) then begin
            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
          end
          else (max_int,`NOTHING)
-       in
+       in*)
        let _ = if (snd test_list) != `NOTHING then
          let occ,s1,s2 = match test_list with
            | (x,`TAG (tag)) -> (x, "tag", (Tag.to_string tag))
@@ -79,6 +81,7 @@ let main v query_string 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 
                
@@ -95,7 +98,7 @@ let main v query_string output =
                  in ()
                else      
                  let result = time (top_down auto) v in          
-                 let rcount = IdSet.length result in
+                 let rcount = GResult.length result in
                    Printf.eprintf "Number of nodes in the result set : %i\n" rcount;
                    Printf.eprintf "\n%!";
                    begin
@@ -106,10 +109,10 @@ let main v query_string output =
                            time( fun () ->
                                    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;
+                                     GResult.iter (fun t -> 
+                                                   Tree.print_xml_fast oc v t;
                                                    output_char oc '\n';
-                                                   output_string oc "----------\n";
+
                                                 ) result) ();
                    end;
          end;
@@ -125,7 +128,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 =