patched and some funtions added

[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 be559adc7f107bb7dda849d4ebb7a4480c252bde..b32b519a15df28a83cb7b8e741c34a8e9d491a84 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mQIProperty.ml
+++ b/helm/ocaml/mathql_interpreter/mQIProperty.ml
@@ -66,13 +66,13 @@ let pg_query h table cols ct cfl =
       | 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_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
+         let f (s, _) = col ^ " ~ " ^ P.quote ("^" ^ s ^ "$") in
          if pat then "(" ^ iter f " or " v ^ ")"
         else match v with 
-           | [s] -> col ^ " = " ^ (P.quote s)     
+           | [(s,_)] -> col ^ " = " ^ (P.quote s)     
            | v   -> col ^ " in (" ^ pg_msval v ^ ")"
       else "true"
    in