Merge of the new_mathql branch with the main branch:

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

diff --git a/helm/ocaml/mathql_interpreter/pattern.ml b/helm/ocaml/mathql_interpreter/pattern.ml
index 39c9f3c3fadb402b92c4f2b7ff987a06b53cc54b..993617bb8b3998b8d780ed5b695705671cf47852 100644 (file)
--- a/helm/ocaml/mathql_interpreter/pattern.ml
+++ b/helm/ocaml/mathql_interpreter/pattern.ml
@@ -35,7 +35,7 @@ open Mathql_semantics;;
 let pattern_ex (apreamble, apattern, afragid) =
  let c = pgc () in
   (*let _ = print_string ("USE ")
-  and t = Unix.time () in*)
+  and t = Sys.time () in*)
   (*let r1 = helm_class_id "MathResource" in*)
    (*let qq = "select att0 from t" ^ r1 ^ " where att0 " ^ (pattern_match apreamble apattern afragid) ^ " order by t" ^ r1 ^ ".att0 asc" in*)
    (*PRE-CLAUDIO
@@ -46,12 +46,13 @@ let pattern_ex (apreamble, apattern, afragid) =
      in
       [["retVal"]] @ List.map (fun l -> [l]) (pgresult_to_string_list res)*)
    let qq = "select uri from registry where uri " ^ (pattern_match (apreamble, apattern, afragid)) ^ " order by registry.uri asc" in
+print_endline qq ; flush stderr ;
    (*let _ = print_endline qq in*)
     let res =
      c#exec (qq)
     in
 (* PRE-CLAUDIO
-     (*let _ = print_endline (string_of_float (Unix.time () -. t)); flush stdout in*)
+     (*let _ = print_endline (string_of_float (Sys.time () -. t)); flush stdout in*)
       result*)
      List.map
       (function uri -> {uri = uri ; attributes = [] ; extra = ""})