X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftable_driver.ml;h=767cfdcc9d5856ef3b3e2ea1053efa7d405f053f;hb=5a2f69473adac536c778653a9f6c4d1267510945;hp=64d1a1dae72a1448419d59c46f387128cc09a17c;hpb=72880536f01e8260441efda43430f893e8e4595b;p=tatoo.git

diff --git a/src/table_driver.ml b/src/table_driver.ml
index 64d1a1d..767cfdc 100644
--- a/src/table_driver.ml
+++ b/src/table_driver.ml
@@ -27,12 +27,15 @@ let main () =
   let query_tree_list =
     List.map (fun query -> compile_xpath query) queries
   in
-     List.iter ( fun q -> 
-      let res = eval_query_tree doc [ (Naive_tree.root doc) ] q in
-      print_string "<xml_result num=\"1\" >\n";
-      print_node_list doc res;
-      print_string "</xml_result>\n"
-    ) query_tree_list ;
+  let mini_qtree_list = 
+    List.map (fun qtree -> Query_tree.minimize_qtree qtree) query_tree_list 
+  in
+  List.iter ( fun q -> 
+    let res = eval_qtree doc [ (Naive_tree.root doc) ] q in
+    print_string "<xml_result num=\"1\" >\n";
+    print_node_list doc res;
+    print_string "</xml_result>\n";
+  ) mini_qtree_list ;
   
   let _ = if !Table_options.count then 
        Format.fprintf Format.std_formatter "there are %i nodes\n" !Query_tree.compteur;