X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmathql_interpreter%2Fdbconn.ml;h=b38eabe8712f71dcae52b59177ea7f1bc24c01e1;hb=5953b6e29b26a296d18dee9d453cec1255d65c1c;hp=a6b1b2cce8351f15345a5bc6f01509762e31b852;hpb=4ac188650f64fb947c5d87dcf3c932a4d013d842;p=helm.git diff --git a/helm/ocaml/mathql_interpreter/dbconn.ml b/helm/ocaml/mathql_interpreter/dbconn.ml index a6b1b2cce..b38eabe87 100644 --- a/helm/ocaml/mathql_interpreter/dbconn.ml +++ b/helm/ocaml/mathql_interpreter/dbconn.ml @@ -33,32 +33,21 @@ *) open MathQL;; -exception MQInvalidURI of string -exception MQConnectionFailed of string -exception MQInvalidConnection of string - - - -(* - * 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 ;; @@ -68,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)) ;; (*