X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=main.ml;h=c9885e61ffe425757be3c1d26ac7a21c0abd6507;hb=477c1bef21a38e8371a745da9491fd6a6aae2aa5;hp=021a18e935bc2b1886aab07cbaec018aa2b65ac5;hpb=d550133ad7afdf65c5e284c2bcf67a5bdde6faa7;p=SXSI%2Fxpathcomp.git

diff --git a/main.ml b/main.ml
index 021a18e..c9885e6 100644
--- 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,6 +55,8 @@ 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 : ";
@@ -66,7 +68,7 @@ let main v query_string output =
 				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))
@@ -96,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
@@ -107,7 +109,7 @@ 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 -> 
+				      GResult.iter (fun t -> 
 						    Tree.print_xml_fast oc v t;
 						    output_char oc '\n';