ocaml 3.09 transition

[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 7550bcc9c025fc97335a0df518a1fd9b5a173e93..60a003a3213891a8391da74fb550e0ee72a622b3 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 C = MQIConn
 module U = MQIUtil
+module A = MQIMap
 
 let not_supported s = 
    raise (Failure ("MQIProperty: feature not supported: " ^ s)) 
@@ -52,51 +52,6 @@ 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 P.quote ", " 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 =
@@ -112,57 +67,31 @@ let pg_result distinct subj el res =
   in
   compose mk_avs res
 
-let get_table mc ct cfl el =
-   let fst = function
-      | []           -> None
-      | head :: tail -> Some head
-   in
-   let comp n1 n2 = match n1, n2 with
-      | None, _                   -> n2 
-      | Some h, Some k when h = k -> n2
-      | _, None                   -> n1
-      | _                         -> not_supported "comp"
-   in   
-   let rec get_c prev = function
-      | []                -> prev
-      | (_, p, _) :: tail -> get_c (comp prev (fst p)) tail
-   in
-   let rec get_e prev = function
-      | []             -> prev
-      | (p, _) :: tail -> get_e (comp prev (fst p)) tail
-   in
-   get_e (get_c (get_c (fst mc) ct) (List.concat cfl)) el  
-
-let rec decolon s =
-   let l = String.length s in
-   try 
-      let i = String.index s ':' in
-      String.sub s 0 i ^ "_" ^ decolon (String.sub s (succ i) (l - succ i))
-   with Not_found -> s
+let get_table h mc ct cfl el =
+   let aux_c ts (_, p, _) = A.refine_tables ts (C.tables h p) in
+   let aux_e ts (p, _) = A.refine_tables ts (C.tables h p) in
+   let fst = C.tables h mc in
+   let snd = List.fold_left aux_c fst (ct @ (List.concat cfl)) in
+   let trd = List.fold_left aux_e snd el in
+   A.default_table trd
 
-let conv = function
-   | []             -> "source"
-   | ["objectName"] -> "value" 
-   | [t]            -> ""
-   | [_; t]         -> decolon t
-   | _              -> not_supported "conv" 
-
-let exec_single h mc ct cfl el t =
-   let table = match t with Some t -> decolon t | None -> "objectName" in
+let exec_single h mc ct cfl el table =
+   let conv p = C.field h p table in
    let first = conv mc in
    let mk_con l = List.map (fun (pat, p, v) -> (pat, conv p, v)) l in
    let cons_true = mk_con ct in 
    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
-   pg_result false first el (low_level h table cols cons_true cons_false) 
+   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 false first el r
    
 let deadline = 100
 
 let exec h refine mc ct cfl el =
    if refine <> M.RefineExact then not_supported "exec";   
-   let table = get_table mc ct cfl el in
+   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
@@ -170,13 +99,3 @@ let exec h refine mc ct cfl el =
       | _                                                 ->
          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"]