X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Ftest.ml;h=42dc011990d5a86b0baa17775f04e095f36ab000;hp=7d6bf58b480d14181036629168bc8a9fc1b9db3a;hb=a43a51c51314468a47a36904c2b904f5a9a14bca;hpb=8d6d935051b853939a615a8a56fd9f7b8035c1cc

diff --git a/src/test.ml b/src/test.ml
index 7d6bf58..42dc011 100644
--- a/src/test.ml
+++ b/src/test.ml
@@ -14,9 +14,9 @@
 (***********************************************************************)
 
 
-(** use: xml_file "XPath querie"
-    or : xml_file -f XPath_querie_file
-    only the first line of XPath_querie_file is read 
+(** use: [./test xml_file "XPath querie"]
+    or : [./test xml_file -f XPath_querie_file]
+    only the first line of [XPath_querie_file] is read 
 *)
 
 open Format
@@ -33,28 +33,44 @@ let query () =
   let arg2 = Sys.argv.(2) in
   if arg2 = "-f"
   then  let fq = open_in Sys.argv.(3) in
-	let q = XPath.parse_file fq in
-	close_in fq;
-	fprintf err_formatter "Parse query OK ! ";
-	q
+        let q = XPath.parse_file fq in
+        close_in fq;
+        fprintf err_formatter "Parse query OK ! ";
+        q
   else let q = XPath.parse_string arg2 in
        fprintf err_formatter "Parse query OK ! ";
        q
 
 let build_asta query =
   let asta = Compil.trans query in
-  fprintf err_formatter "Compil OK !\n";
+  fprintf err_formatter "Compil OK ! ";
   asta
 
+let compute_run doc query = 
+  let run = Run.compute doc query in
+  fprintf err_formatter "Run OK ! \n";
+  run
+
 let () =
-  let query = query () in
   let doc = doc () in
+  let query = query () in
   let asta = build_asta query in
-  fprintf err_formatter "@[<v 0> ##### Query #####@.      %a@]@ "
+  let run = compute_run doc asta in
+  let selected_nodes = Run.selected_nodes doc asta in
+  Format.pp_set_margin err_formatter 80;
+  fprintf err_formatter "@[<v 0>##### Query #####@.  %a@]\n"
     XPath.Ast.print query;
-  Asta.print err_formatter asta;
   output_string stderr "\n##### Doc #####\n";
   Tree.print_xml stderr doc (Tree.root doc);
   output_string stderr "\n";
+  Asta.print err_formatter asta;
+  Run.print err_formatter run;
+  output_string stderr "\n  # Doc with positions: \n";
+  Tree.print_xml_preorder stderr doc (Tree.root doc);
+  let rec print_selec fmt l = match l with
+    | [x] -> fprintf fmt "%s" (string_of_int x)
+    | x :: tl -> fprintf fmt "%s" ((string_of_int x)^"; ");print_selec fmt tl
+    | [] -> fprintf fmt "%s" "ø" in
+  fprintf err_formatter "@.@.  # Selected nodes: {%a}@."
+    print_selec selected_nodes;
   exit 0
-