X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql_interpreter%2Fdbconn.ml;h=b38eabe8712f71dcae52b59177ea7f1bc24c01e1;hb=b1fb6b8e1767d775bc452303629e95941d142bea;hp=e46f89cb280180659b58d43d31552feea343dd0b;hpb=1cfcea66d7394a785ec439cd6b03497b276918c4;p=helm.git

diff --git a/helm/ocaml/mathql_interpreter/dbconn.ml b/helm/ocaml/mathql_interpreter/dbconn.ml
index e46f89cb2..b38eabe87 100644
--- 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/.
  *)
 
 (*
@@ -33,27 +33,22 @@
  *)
 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)
-   |  Some c -> c
+      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))
 ;;
 
 (*