Merge of the new_mathql branch with the main branch:

[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 db4b8fb9cf8542c05183af073b4fdfebbf886e62..b38eabe8712f71dcae52b59177ea7f1bc24c01e1 100644 (file)
--- a/helm/ocaml/mathql_interpreter/dbconn.ml
+++ b/helm/ocaml/mathql_interpreter/dbconn.ml
@@ -33,26 +33,21 @@
  *)
 open MathQL;;
 
-(*
- * paramentri della connessione
- *
- * TODO: bisogna scegliere se questi parametri vengono
- * passati come argomento
- *)
-(*let connection_param = "dbname=helm";;*)
-let connection_param = "host=dotto.cs.unibo.it dbname=helm user=helm";;
+exception InvalidURI of string
+exception ConnectionFailed of string
+exception InvalidConnection
 
 (*
  * connessione al db
  *)
-let conn = ref None;;
+let conn = ref None
 
 (*
  * controllo sulla connessione
  *)
 let pgc () =
    match !conn with
-      None -> raise (MQInvalidConnection connection_param)
+      None   -> raise InvalidConnection
     | Some c -> c
 ;;
 
@@ -62,11 +57,11 @@ let pgc () =
  * TODO
  * passare i parametri della connessione come argomento di init
  *)
-let init () =
+let init connection_param =
    try (
     conn := Some (new Postgres.connection connection_param);
    ) with
-    _ -> raise (MQConnectionFailed ("init: " ^ connection_param))
+    _ -> raise (ConnectionFailed ("init: " ^ connection_param))
 ;;
 
 (*