Db connection ok!

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

diff --git a/helm/ocaml/mathql_interpreter/dbconn.ml b/helm/ocaml/mathql_interpreter/dbconn.ml
index fd207ba0321af92d4a286c09a032e90ca862a7a0..17264f5cb17408e0526ec5f73e619965d04f2d16 100644 (file)
--- a/helm/ocaml/mathql_interpreter/dbconn.ml
+++ b/helm/ocaml/mathql_interpreter/dbconn.ml
@@ -20,7 +20,7 @@
  * MA  02111-1307, USA.
  * 
  * For details, see the HELM World-Wide-Web page,
- * http://cs.unibo.it/helm/.
+ * http://www.cs.unibo.it/helm/.
  *)
 
 (*
@@ -31,7 +31,13 @@
  * le eccezioni lanciate dalle funzioni init e pgc sono
  * definite nel modulo Mathql 
  *)
-open Mathql;;
+open MathQL;;
+
+exception DBInvalidURI of string
+exception DBConnectionFailed of string
+exception DBInvalidConnection of string
+
+
 
 (*
  * paramentri della connessione
@@ -40,7 +46,7 @@ open Mathql;;
  * passati come argomento
  *)
 (*let connection_param = "dbname=helm";;*)
-let connection_param = "host=dotto.cs.unibo.it dbname=helm user=helm";;
+let connection_param = "host=mowgli.cs.unibo.it dbname=helm user=helm";;
 
 (*
  * connessione al db
@@ -52,8 +58,8 @@ let conn = ref None;;
  *)
 let pgc () =
    match !conn with
-      None -> raise (MQInvalidConnection connection_param)
-   |  Some c -> c
+      None -> raise (DBInvalidConnection connection_param)
+    | Some c -> c
 ;;
 
 (*
@@ -65,8 +71,9 @@ let pgc () =
 let init () =
    try (
     conn := Some (new Postgres.connection connection_param);
+    prerr_endline "connected."
    ) with
-    _ -> raise (MQConnectionFailed ("init: " ^ connection_param))
+    _ -> raise (DBConnectionFailed ("init: " ^ connection_param))
 ;;
 
 (*