patched

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

diff --git a/helm/ocaml/mathql_interpreter/mQIProperty.ml b/helm/ocaml/mathql_interpreter/mQIProperty.ml
index b32b519a15df28a83cb7b8e741c34a8e9d491a84..acb5df43a84c48a0ec163eaaf42725822e9728fb 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mQIProperty.ml
+++ b/helm/ocaml/mathql_interpreter/mQIProperty.ml
@@ -27,9 +27,9 @@
  *)
 
 module M = MathQL
-module P = MQIPostgres
+module I = M.I
+module U = AvsUtil
 module C = MQIConn
-module U = MQIUtil
 module A = MQIMap
 
 let not_supported s = 
@@ -53,65 +53,17 @@ let cl_print l =
    in
    List.iter c_print l
 
-(* PostgreSQL backend  ******************************************************)
-
-let pg_query h table cols ct cfl =
-   let exec q = 
-      if C.set h C.Log then C.log h (q ^ "\n");
-      P.exec (C.pgc h) q 
-   in
-   let rec iter f sep = function
-      | []           -> ""
-      | [head]       -> f head 
-      | head :: tail -> f head ^ sep ^ iter f sep tail
-   in
-   let pg_cols = iter (fun x -> x) ", " cols in
-   let pg_msval v = iter (fun s, _ -> P.quote s) ", " v in
-   let pg_con (pat, col, v) = 
-      if col <> "" then 
-         let f (s, _) = col ^ " ~ " ^ P.quote ("^" ^ s ^ "$") in
-         if pat then "(" ^ iter f " or " v ^ ")"
-        else match v with 
-           | [(s,_)] -> col ^ " = " ^ (P.quote s)     
-           | v   -> col ^ " in (" ^ pg_msval v ^ ")"
-      else "true"
-   in
-   let pg_cons l = iter pg_con " and " l in
-   let pg_cons_not l = "not (" ^ pg_cons l ^ ")" in
-   let pg_cons_not_l ll = iter pg_cons_not " and " ll in
-   let pg_where = match ct, cfl with
-      | [], []  -> ""
-      | lt, []  -> " where " ^ pg_cons lt
-      | [], llf -> " where " ^ pg_cons_not_l llf
-      | lt, llf -> " where " ^ pg_cons lt ^ " and " ^ pg_cons_not_l llf
-   in
-   if cols = [] then
-      let r = exec ("select count (source) from " ^ table ^ pg_where) in
-      match r with
-         | [[s]] when int_of_string s > 0 -> [[]]
-        | _                              -> []
-   else
-      exec ("select " ^ pg_cols ^ " from " ^ table ^ pg_where ^ 
-            " order by " ^ List.hd cols ^ " asc")
-
-(* Galax backend  ***********************************************************)
-
-let gx_query h table cols ct cfl = not_supported "Galax"
-
 (* Common functions  ********************************************************)
 
-let pg_result distinct subj el res =
-  let compose = if distinct then List.map else fun f -> U.mql_iter (fun x -> [f x]) in 
+let pg_result subj el res =
   let get_name = function (p, None) -> p | (_, Some p) -> p in
   let names = List.map get_name el in
-  let mk_grp l = 
-     let grp = U.mql_iter2 (fun p s -> [(p, [s])]) names l in 
-     if grp = [] then [] else [grp]
-  in
-  let mk_avs l =
-     if subj = "" then ("", mk_grp l) else (List.hd l, mk_grp (List.tl l))
+  let mk_grp l = U.grp_iter2 I.grp_make names l in
+  let mk_avs l = 
+     if subj = "" then I.make "" (mk_grp l) 
+     else I.make (List.hd l) (mk_grp (List.tl l))
   in
-  compose mk_avs res
+  U.iter mk_avs res
 
 let get_table h mc ct cfl el =
    let aux_c ts (_, p, _) = A.refine_tables ts (C.tables h p) in
@@ -129,9 +81,9 @@ let exec_single h mc ct cfl el table =
    let cons_false = List.map mk_con cfl in
    let other_cols = List.map (fun (p, _) -> conv p) el in 
    let cols = if first = "" then other_cols else first :: other_cols in
-   let low_level = if C.set h C.Galax then gx_query else pg_query in
-   let result = low_level h (C.resolve h table) cols cons_true cons_false in
-   pg_result false first el result 
+   let out q = if C.set h C.Queries then C.log h (q ^ "\n") in
+   let r = C.exec h out (C.resolve h table) cols cons_true cons_false in
+   pg_result first el r
    
 let deadline = 100
 
@@ -139,19 +91,9 @@ let exec h refine mc ct cfl el =
    if refine <> M.RefineExact then not_supported "exec";   
    let table = get_table h mc ct cfl el in
    let rec exec_aux ct = match ct with 
-      | (pat, p, v) :: tail when List.length v > deadline ->
-         let single s = exec_aux ((pat, p, [s]) :: tail) in
-        U.mql_iter single v
+      | (pat, p, v) :: tail when U.count v > deadline ->
+         let single a s _ = I.union a (exec_aux ((pat, p, I.make s I.grp_empty) :: tail)) in
+        I.iter single U.val_false v
       | _                                                 ->
          exec_single h mc ct cfl el table
    in exec_aux ct       
-
-(* funzioni vecchie  ********************************************************)
-
-let pg_name h s = 
-   let q = "select id from registry where uri = " ^ P.quote s in
-   match P.exec h q with
-      | [[id]] -> "t" ^ id
-      | _      -> ""
-
-let get_id b = if b then ["B"] else ["F"]