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 cc03b61b8dc3a8d33dc61783d72e166a3685e07f..993617bb8b3998b8d780ed5b695705671cf47852 100644 (file)
--- 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,14 +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 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
+  (*let _ = print_string ("USE ")
+  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
+   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 (Sys.time () -. t)); flush stdout in*)
+      result*)
+     List.map
+      (function uri -> {uri = uri ; attributes = [] ; extra = ""})
+      (pgresult_to_string_list res)
 ;;