interpreter flags were reorganized

[helm.git] / helm / ocaml / mathql_interpreter / mQueryInterpreter.ml

diff --git a/helm/ocaml/mathql_interpreter/mQueryInterpreter.ml b/helm/ocaml/mathql_interpreter/mQueryInterpreter.ml
index 57e1207bcbef3c6187fb1ce5cfe9691c99d2ac9d..e387c7fb9f9e7d8dff353eb71c0fa7d2f75ad02c 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mQueryInterpreter.ml
+++ b/helm/ocaml/mathql_interpreter/mQueryInterpreter.ml
@@ -154,7 +154,7 @@ let execute h x =
         let t = P.start_time () in
         let r = MQIProperty.exec h q1 subj cons_true cons_false exp in 
         let s = P.stop_time t in
-         if C.set h C.Stat then 
+         if C.set h C.Times then 
            C.log h (Printf.sprintf "Property: %s,%i\n" s (U.count r));
         c, r 
       | M.Select (i, x, y) ->
@@ -188,9 +188,11 @@ let execute h x =
    in
    let c = {svars = []; avars = []; groups = []} in
    let t = P.start_time () in
+   if C.set h C.Source then F.text_of_query (C.log h) "\n" x;
    let _, r = eval_query c x in
+   if C.set h C.Result then F.text_of_result (C.log h) "\n" r;
    let s = P.stop_time t in
-   if C.set h C.Stat then 
+   if C.set h C.Times then 
       C.log h (Printf.sprintf "MQIExecute: %s,%s\n" s 
          (C.string_of_flags (C.flags h)));
    r