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 5f1d2567295ce8b2930f86165e1acfe0c377f6eb..17264f5cb17408e0526ec5f73e619965d04f2d16 100644 (file)
--- a/helm/ocaml/mathql_interpreter/dbconn.ml
+++ b/helm/ocaml/mathql_interpreter/dbconn.ml
@@ -1,19 +1,52 @@
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://www.cs.unibo.it/helm/.
+ *)
 
 (*
  * gestione della connessione al database
  *)
 
 (*
- * le eccezzioni lanciate dalle funzioni init e pgc sono
+ * 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
+ *
+ * TODO: bisogna scegliere se questi parametri vengono
+ * passati come argomento
  *)
-(*let connection_param = "host=127.0.0.1 dbname=helm";;*)
-let connection_param = "host=dotto.cs.unibo.it dbname=helm user=helm";;
+(*let connection_param = "dbname=helm";;*)
+let connection_param = "host=mowgli.cs.unibo.it dbname=helm user=helm";;
 
 (*
  * connessione al db
@@ -25,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
 ;;
 
 (*
@@ -38,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))
 ;;
 
 (*