X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql_interpreter%2Fpattern.ml;h=9809552a034c64d55373c3dfcd771157409b5b3c;hb=6f6b8f33397548319fef9b374f9e9017e7fa151d;hp=fa28f6cc5a4c682650c8cef556ade0f6341615dc;hpb=7f510b2df638258669d6539861a3f06ed5fab773;p=helm.git

diff --git a/helm/ocaml/mathql_interpreter/pattern.ml b/helm/ocaml/mathql_interpreter/pattern.ml
index fa28f6cc5..9809552a0 100644
--- a/helm/ocaml/mathql_interpreter/pattern.ml
+++ b/helm/ocaml/mathql_interpreter/pattern.ml
@@ -20,28 +20,35 @@
  * MA  02111-1307, USA.
  * 
  * For details, see the HELM World-Wide-Web page,
- * http://cs.unibo.it/helm/.
- *)
-
-(*
- * implementazione del comando PATTERN
+ * http://www.cs.unibo.it/helm/.
  *)
 
 open Dbconn;;
 open Utility;;
-open Eval;;
-open Mathql_semantics;;
 
-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 qq = "select uri from registry where uri " ^ (pattern_match apreamble apattern afragid) ^ " order by registry.uri asc" in
-   (*let _ = print_endline qq in*)
-    let res =
-     c#exec (qq)
-    in
-     List.map
-      (function uri -> {uri = uri ; attributes = []})
-      (pgresult_to_string_list res)
+let cat l1 l2 =
+    if l1 > l2 then 
+        l2 @ l1
+    else
+        l1 @ l2
+;;
+
+let rec pattern_ex l =
+  match l with
+     [] -> []
+   | s::tl -> let result = 
+             let c = pgc () in
+             let quoted_s =
+              Str.global_substitute (Str.regexp "'")
+               (function _ -> "\\'") s in
+             let qq = "select uri from registry where uri ~ '" ^ quoted_s ^ "' order by registry.uri asc" in
+             let res = c#exec (qq) in
+             List.map (function uri -> (List.hd uri,[])) res#get_list
+             (*for i = 0 to res#ntuples do 
+	     List.map (function uri -> (uri,[])) (res#get_tuple_list i)
+             done*)
+
+	     in
+	     cat result (pattern_ex tl)
 ;;
+