X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql_test%2Fmqitop.ml;h=8a80537184c722cb3b307c0b9e15f21d4cc3e6c6;hb=f41a5585a648d57e4d8a24d664b0a5ce5d591148;hp=fc206c68d908a579860b4c0808e54c673ebbaeba;hpb=03dee221bd1f2c9a6e7f74d9abf88be14aac7763;p=helm.git

diff --git a/helm/ocaml/mathql_test/mqitop.ml b/helm/ocaml/mathql_test/mqitop.ml
index fc206c68d..8a8053718 100644
--- a/helm/ocaml/mathql_test/mqitop.ml
+++ b/helm/ocaml/mathql_test/mqitop.ml
@@ -1,25 +1,53 @@
-module MQICallbacks =
-   struct
-      let log s = print_string s; flush stdout
-   end
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(*  AUTOR: Ferruccio Guidi <fguidi@cs.unibo.it>
+ *)
+
+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)