- New interface for the MathQL interpreter (1.3 version)

[helm.git] / helm / ocaml / mquery_generator / mQueryGenerator.ml

diff --git a/helm/ocaml/mquery_generator/mQueryGenerator.ml b/helm/ocaml/mquery_generator/mQueryGenerator.ml
index ed52e55bda7e11825d8299628fcb2c6369d990c8..ec9f98d1c3208aa0b9fd4882b4ae4caf6fe300f9 100644 (file)
--- a/helm/ocaml/mquery_generator/mQueryGenerator.ml
+++ b/helm/ocaml/mquery_generator/mQueryGenerator.ml
@@ -33,9 +33,14 @@
 (*                                                                            *)
 (******************************************************************************)
 
-(* Query issuing functions **************************************************)
+module MQICallbacks =
+   struct
+      let log s = prerr_string s
+   end
 
+module MQI = MQueryInterpreter.Make(MQICallbacks)
 
+(* Query issuing functions **************************************************)
 
 type uri = string
 type position = string
@@ -93,7 +98,7 @@ let execute_query query =
       flush och 
    in
    let execute q =
-      let r = Mqint.execute q in    
+      let r = MQI.execute "" q in    
       if ! log_file <> "" then log q r; 
       info := string_of_int ! query_num :: ! info;
       incr query_num;