ocaml 3.09 transition

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

diff --git a/helm/ocaml/mathql_interpreter/mQIConn.ml b/helm/ocaml/mathql_interpreter/mQIConn.ml
index 460ef41d088b5bd91481a152a3e32f4cbc2e6b1c..aaf16fac4c0c692c037eaa793b58c80a7c734622 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mQIConn.ml
+++ b/helm/ocaml/mathql_interpreter/mQIConn.ml
@@ -26,14 +26,18 @@
 (*  AUTOR: Ferruccio Guidi <fguidi@cs.unibo.it>
  *)
 
-type flag = Postgres | Galax | Stat | Quiet | Warn | Log
+type connection = MySQL_C    of HMysql.dbd
+                | Postgres_C of Postgres.connection
+               | No_C
+                  
+type flag = Galax | Postgres | Queries | Result | Source | Times | Warn
 
 type handle = {
-   log : string -> unit;             (* logging function        *)
-   set : flag list;                  (* options                 *)
-   pgc : Postgres.connection option; (* PG connection           *)
-   pgm : MQIMap.pg_map;              (* PG conversion function  *)
-   pga : MQIMap.pg_alias             (* PG table aliases        *)
+   log : string -> unit; (* logging function        *)
+   set : flag list;      (* options                 *)
+   pgc : connection;     (* PG connection           *)
+   pgm : MQIMap.pg_map;  (* PG conversion function  *)
+   pga : MQIMap.pg_alias (* PG table aliases        *)
 }
 
 let tables handle p = MQIMap.get_tables handle.pgm p
@@ -51,20 +55,22 @@ let pgc handle = handle.pgc
 let flags handle = handle.set 
 
 let string_of_flag = function
-      | Postgres -> "P"
       | Galax    -> "G"
-      | Stat     -> "S"
-      | Quiet    -> "Q"
+      | Postgres -> "P"
+      | Queries  -> "Q"
+      | Result   -> "R"
+      | Source   -> "S"      
+      | Times    -> "T"
       | Warn     -> "W"
-      | Log      -> "L"
 
 let flag_of_char = function
-      | 'P' -> [Postgres]
       | 'G' -> [Galax]
-      | 'S' -> [Stat]
-      | 'Q' -> [Quiet] 
+      | 'P' -> [Postgres]
+      | 'Q' -> [Queries] 
+      | 'R' -> [Result]
+      | 'S' -> [Source]
+      | 'T' -> [Times]
       | 'W' -> [Warn] 
-      | 'L' -> [Log]
       | _   -> []
 
 let string_fold_left f a s =
@@ -78,30 +84,45 @@ let string_of_flags flags =
 let flags_of_string s =
    string_fold_left (fun l c -> l @ flag_of_char c) [] s
 
-let init myflags mylog =
+let init ?(flags = []) ?(log = ignore) () =
+   let flags = 
+      if flags = [] then
+         flags_of_string (Helm_registry.get "mathql_interpreter.flags")
+      else 
+         flags
+   in
    let m, a =
       let g = 
-         if List.mem Galax myflags 
+         if List.mem Galax flags 
            then MQIMap.empty_map else MQIMap.read_map
       in g ()
    in
-   {log = mylog; set = myflags; 
-    pgc =
-     if List.mem Galax myflags then
-      None
-     else
-      MQIPostgres.init
-       (Helm_registry.get "mathql_interpreter.postgresql_connection_string");
+   {log = log; set = flags; 
+    pgc = begin
+      try
+         if List.mem Galax flags then No_C else
+         if List.mem Postgres flags then Postgres_C (MQIPostgres.init ()) else
+        MySQL_C (MQIMySql.init ())
+      with Failure "mqi_connection" -> No_C
+    end;
     pgm = m; pga = a
    }      
 
 let close handle =
-   if set handle Galax then () else MQIPostgres.close handle.pgc
+   match pgc handle with
+      | MySQL_C c    -> MQIMySql.close c
+      | Postgres_C c -> MQIPostgres.close c
+      | No_C         -> ()
+
+let exec handle out table cols ct cfl =
+   match pgc handle with
+      | MySQL_C c    -> MQIMySql.exec (c, out) table cols ct cfl
+      | Postgres_C c -> MQIPostgres.exec (c, out) table cols ct cfl
+      | No_C         -> []
 
 let connected handle =
-   if set handle Galax then false else (pgc handle) <> None  
+   pgc handle <> No_C  
 
-let init_if_connected myflags mylog =
-   let handle = init myflags mylog in
-   ignore (pgc handle); handle
- 
+let init_if_connected ?(flags = []) ?(log = ignore) () =
+   let handle = init ~flags:flags ~log:log () in
+   if connected handle then handle else raise (Failure "mqi connection failed")