* New operators (Subset, SetEqual and RVarOccurrence) added to MathQL

[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 c9dde8b6ab39f4e50f77bef332d7ede617a090c3..fa28f6cc5a4c682650c8cef556ade0f6341615dc 100644 (file)
--- a/helm/ocaml/mathql_interpreter/pattern.ml
+++ b/helm/ocaml/mathql_interpreter/pattern.ml
@@ -30,14 +30,18 @@
 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) 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
-     [["retVal"]] @ List.map (fun l -> [l]) (pgresult_to_string_list res)
+     List.map
+      (function uri -> {uri = uri ; attributes = []})
+      (pgresult_to_string_list res)
 ;;