now mathql interpreter use helm registry

[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 f38964f060f6e90f1f71542ba8b416a06177596d..460ef41d088b5bd91481a152a3e32f4cbc2e6b1c 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mQIConn.ml
+++ b/helm/ocaml/mathql_interpreter/mQIConn.ml
@@ -23,23 +23,32 @@
  * http://cs.unibo.it/helm/.
  *)
 
-exception InvalidConnection
+(*  AUTOR: Ferruccio Guidi <fguidi@cs.unibo.it>
+ *)
+
+type flag = Postgres | Galax | Stat | Quiet | Warn | Log
+
+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        *)
+}
 
-type flag = Postgres | Galax | Stat | Quiet | Warn
+let tables handle p = MQIMap.get_tables handle.pgm p
 
-type handle = {log : string -> unit;            (* logging function    *)
-               set : flag list;                 (* options             *)
-              pgc : Postgres.connection option (* Postgres connection *)
-             }
+let field handle p t = MQIMap.get_field handle.pgm p t
+
+let resolve handle a = MQIMap.resolve handle.pga a
 
 let log handle = handle.log
 
 let set handle flag = List.mem flag handle.set
 
-let pgc handle = 
-   match handle.pgc with
-      | None   -> raise InvalidConnection
-      | Some c -> c
+let pgc handle = handle.pgc 
+
+let flags handle = handle.set 
 
 let string_of_flag = function
       | Postgres -> "P"
@@ -47,6 +56,7 @@ let string_of_flag = function
       | Stat     -> "S"
       | Quiet    -> "Q"
       | Warn     -> "W"
+      | Log      -> "L"
 
 let flag_of_char = function
       | 'P' -> [Postgres]
@@ -54,6 +64,7 @@ let flag_of_char = function
       | 'S' -> [Stat]
       | 'Q' -> [Quiet] 
       | 'W' -> [Warn] 
+      | 'L' -> [Log]
       | _   -> []
 
 let string_fold_left f a s =
@@ -68,24 +79,27 @@ let flags_of_string s =
    string_fold_left (fun l c -> l @ flag_of_char c) [] s
 
 let init myflags mylog =
-   let default_connection_string =
-      "host=mowgli.cs.unibo.it dbname=helm_mowgli_new_schema user=helm"
-   in
-   let connection_string =
-      try Sys.getenv "POSTGRESQL_CONNECTION_STRING"
-      with Not_found -> default_connection_string 
+   let m, a =
+      let g = 
+         if List.mem Galax myflags 
+           then MQIMap.empty_map else MQIMap.read_map
+      in g ()
    in
    {log = mylog; set = myflags; 
-    pgc = if List.mem Galax myflags 
-       then None else Dbconn.init connection_string
+    pgc =
+     if List.mem Galax myflags then
+      None
+     else
+      MQIPostgres.init
+       (Helm_registry.get "mathql_interpreter.postgresql_connection_string");
+    pgm = m; pga = a
    }      
 
 let close handle =
-   if set handle Galax then () else Dbconn.close handle.pgc
+   if set handle Galax then () else MQIPostgres.close handle.pgc
 
 let connected handle =
-   if set handle Galax then false else
-   try ignore (pgc handle); true with InvalidConnection -> false 
+   if set handle Galax then false else (pgc handle) <> None  
 
 let init_if_connected myflags mylog =
    let handle = init myflags mylog in