X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql_interpreter%2FmQIMySql.ml;fp=helm%2Focaml%2Fmathql_interpreter%2FmQIMySql.ml;h=40bb16c46d4cc7766d8d5c563a37e699c0e4677a;hb=06b6527a689f994864c13f0ffe401a5b8c052002;hp=591bfe87972c973a0390e48e852a3eef58a0db73;hpb=980a9931d3f7b8ce073247c88d7ecd42a672ad74;p=helm.git

diff --git a/helm/ocaml/mathql_interpreter/mQIMySql.ml b/helm/ocaml/mathql_interpreter/mQIMySql.ml
index 591bfe879..40bb16c46 100644
--- a/helm/ocaml/mathql_interpreter/mQIMySql.ml
+++ b/helm/ocaml/mathql_interpreter/mQIMySql.ml
@@ -45,38 +45,38 @@ let quote s =
    in
    "'" ^ quote_aux s ^ "'"
 
-let exec c q = 
+let exec (c, out) q = 
    let g = function None -> "" | Some v -> v in
    let f a = List.map g (Array.to_list a) in
-   Mysql.map ~f:f (Mysql.exec c q), q
+   out q; Mysql.map ~f:f (Mysql.exec c q)
 
 let exec c table cols ct cfl =
-   let rec iter f sep = function
-      | []           -> ""
+   let rec iter f last sep = function
+      | []           -> last
       | [head]       -> f head 
-      | head :: tail -> f head ^ sep ^ iter f sep tail
+      | head :: tail -> f head ^ sep ^ iter f last sep tail
    in
-   let avs_iter f sep v =
+   let avs_iter f last sep v =
       let aux a s = function
          | true  -> a ^ (f s) ^ sep
 	 | false -> a ^ (f s)
       in
-      I.iter aux "" v
+      if v = I.empty then last else I.iter aux "" v  
    in
-   let pg_cols = iter (fun x -> x) ", " cols in
-   let pg_msval v = avs_iter quote ", " v in
+   let pg_cols = iter (fun x -> x) "" ", " cols in
+   let pg_msval v = avs_iter quote "" ", " v in
    let pg_con (pat, col, v) = 
       if col <> "" then 
-	 let f s = col ^ " regexp " ^ quote ("^" ^ s ^ "$") in
-	 if pat then "(" ^ avs_iter f " or " v ^ ")"
-	 else match I.single v with 
-	    | Some s -> "binary " ^ col ^ " = " ^ (quote s)     
-	    | None   -> "binary " ^ col ^ " in (" ^ pg_msval v ^ ")"
+         let f s = col ^ " regexp " ^ quote ("^" ^ s ^ "$") in
+         if pat then "(" ^ avs_iter f "0" " or " v ^ ")"
+         else match I.single v with 
+            | Some s -> col ^ " = " ^ (quote s)     
+            | None   -> col ^ " in (" ^ pg_msval v ^ ")"
       else "1"
    in
-   let pg_cons l = iter pg_con " and " l in
+   let pg_cons l = iter pg_con "1" " 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_cons_not_l ll = iter pg_cons_not "1" " and " ll in
    let pg_where = match ct, cfl with
       | [], []  -> ""
       | lt, []  -> " where " ^ pg_cons lt
@@ -84,10 +84,10 @@ let exec c table cols ct cfl =
       | lt, llf -> " where " ^ pg_cons lt ^ " and " ^ pg_cons_not_l llf
    in
    if cols = [] then
-      let r, q = exec c ("select count (source) from " ^ table ^ pg_where) in
+      let r = exec c ("select count(source) from " ^ table ^ pg_where) in
       match r with
-         | [[s]] when int_of_string s > 0 -> [[]], q
-	 | _                              -> [], q
+         | [[s]] when int_of_string s > 0 -> [[]]
+         | _                              -> []
    else
       exec c ("select " ^ pg_cols ^ " from " ^ table ^ pg_where ^ 
-            " order by " ^ List.hd cols ^ " asc") (* desc *) 
+            " order by " ^ List.hd cols ^ " asc")