MQueryInterpreter: interface updated

[helm.git] / helm / ocaml / mathql_test / mqitop.ml

diff --git a/helm/ocaml/mathql_test/mqitop.ml b/helm/ocaml/mathql_test/mqitop.ml
index 6031fedf2e302d05b68dd8d76874c5b404dc3cc8..a9673205f9d787cdb4a1bbf99dc6eb08b6b1f827 100644 (file)
--- a/helm/ocaml/mathql_test/mqitop.ml
+++ b/helm/ocaml/mathql_test/mqitop.ml
@@ -1,26 +1,25 @@
-module MQICallbacks =
-   struct
-      let log s = print_string s; flush stdout
-   end
+module U = MQueryUtil
+module X = MQueryMisc
+module I = MQueryInterpreter
+module C = MQIConn
 
 let _ =
-   let module U = MQueryUtil in
-   let module X = MQueryMisc in
-   let module I = MQueryInterpreter.Make(MQICallbacks) in
    let t = X.start_time () in
    let ich = Lexing.from_channel stdin in
-   let flags = if Array.length Sys.argv >= 2 then Sys.argv.(1) else "" in 
+   let flags = if Array.length Sys.argv >= 2 then Sys.argv.(1) else "" in
+   let log s = print_string s; flush stdout in
+   let handle = C.init (C.flags_of_string flags) log in 
+   if not (C.connected handle) then begin  
+       print_endline "mqitop: no connection"; flush stdout
+   end;
    let rec aux () =
       let t = X.start_time () in
-      let r = I.execute flags (U.query_of_text ich) in
+      let r = I.execute handle (U.query_of_text ich) in
       U.text_of_result print_string r "\n";
       Printf.printf "mqitop: query: %s,%i\n" (X.stop_time t) (List.length r);
       flush stdout; aux()
       
    in
-   if not (I.init flags) then begin  
-       print_endline "mqitop: no connection"; flush stdout
-   end;
    begin try aux() with End_of_file -> () end;
-   I.close flags;
+   C.close handle;
    Printf.printf "mqitop: done: %s\n" (X.stop_time t)