X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Ftable_driver.ml;h=07c6523be25cc0f69c9f8b2bf0f26e63cb5cb927;hb=refs%2Fheads%2Ffeature%2Fstage-huibo;hp=6ac6acb07eab64426a62a49b3e29ee9bb79b1850;hpb=c31dce9d175ad3b9fca57706d6e1f45cd1669d6c;p=tatoo.git
diff --git a/src/table_driver.ml b/src/table_driver.ml
index 6ac6acb..07c6523 100644
--- a/src/table_driver.ml
+++ b/src/table_driver.ml
@@ -5,6 +5,8 @@ open Query_tree
let parse_xpath p =
Xpath.Parser.parse (Ulexing.from_utf8_string p)
+let display = ref true
+
let main () =
let () = Table_options.parse () in
let doc =
@@ -18,7 +20,6 @@ let main () =
close_fd();
doc
in
- (*Hashtbl.clear Query_tree.table_query_tree; il faut vider le hashtbl?????????????????*)
let queries =
List.map ( fun q ->
parse_xpath q)
@@ -31,17 +32,24 @@ let main () =
let mini_qtree_list =
List.map (fun qtree -> Query_tree.minimize_qtree qtree) query_tree_list
in
+ let root = Bitvector.create (Naive_tree.size doc) in
+ Bitvector.set root 0 true;
List.iter ( fun q ->
- let res = eval_qtree doc [ (Naive_tree.root doc) ] q in
- print_string "\n";
- print_node_list doc res;
- print_string "\n";
+ let v = eval_qtree doc root q in
+ if !display then begin
+ let res = decode_bit doc v in
+
+ print_string "\n";
+ print_node_list doc res;
+ print_string "\n";
+ end;
+ ()
) mini_qtree_list ;
let t2 = Unix.gettimeofday () in
let t = (t2 -. t1) *. 1000. in
let _ = if !Table_options.count then
- Format.fprintf Format.std_formatter "there are %i nodes\nit takes %fms\n" !Query_tree.compteur t;
+ Format.fprintf Format.std_formatter "there are %i nodes\nquery_tree size : %i\nit takes %fms\n" !Table.node_compteur !Query_tree.query_tree_size t;
in
exit 0