X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql_interpreter%2Fpattern.ml;h=576226008de0a5463c861cd6a076a72ee2723368;hb=8f89cdd08d9ee0a243cf84201bf42e5503759ee3;hp=b68baa9a4e4970880aac74dc6eb8057229c72072;hpb=2ef44e8d1a908a08d31e6114c15898ae7dc8109e;p=helm.git

diff --git a/helm/ocaml/mathql_interpreter/pattern.ml b/helm/ocaml/mathql_interpreter/pattern.ml
index b68baa9a4..576226008 100644
--- a/helm/ocaml/mathql_interpreter/pattern.ml
+++ b/helm/ocaml/mathql_interpreter/pattern.ml
@@ -20,7 +20,7 @@
  * MA  02111-1307, USA.
  * 
  * For details, see the HELM World-Wide-Web page,
- * http://cs.unibo.it/helm/.
+ * http://www.cs.unibo.it/helm/.
  *)
 
 (*
@@ -30,15 +30,31 @@
 open Dbconn;;
 open Utility;;
 open Eval;;
+open Mathql_semantics;;
 
-let pattern_ex apreamble apattern afragid =
+let pattern_ex (apreamble, apattern, afragid) =
  let c = pgc () in
+  (*let _ = print_string ("USE ")
+  and t = Unix.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
    let qq = "select uri from registry where uri " ^ (pattern_match apreamble apattern afragid) ^ " order by registry.uri asc" in
+    let result = 
+     let res =
+      c#exec (qq)
+     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
-     [["retVal"]] @ List.map (fun l -> [l]) (pgresult_to_string_list res)
+(* PRE-CLAUDIO
+     (*let _ = print_endline (string_of_float (Unix.time () -. t)); flush stdout in*)
+      result*)
+     List.map
+      (function uri -> {uri = uri ; attributes = [] ; extra = ""})
+      (pgresult_to_string_list res)
 ;;