mqint updated

diff --git a/helm/ocaml/mathql_interpreter/Makefile b/helm/ocaml/mathql_interpreter/Makefile
index a8aea2b32a6f6389430629de761429d5188ee96d..14cc838f96ab79a26e44c071eea9da630c8f07e3 100644 (file)
--- a/helm/ocaml/mathql_interpreter/Makefile
+++ b/helm/ocaml/mathql_interpreter/Makefile
@@ -8,7 +8,7 @@ IMPLEMENTATION_FILES =  dbconn.ml utility.ml relation.ml diff.ml meet.ml sub.ml
 
 # $(INTERFACE_FILES:%.mli=%.ml)
 
-EXTRA_OBJECTS_TO_INSTALL = 
+EXTRA_OBJECTS_TO_INSTALL = context.ml
 
 EXTRA_OBJECTS_TO_CLEAN =
 

diff --git a/helm/ocaml/mathql_interpreter/dbconn.ml b/helm/ocaml/mathql_interpreter/dbconn.ml
index d5db3125224aa2ee5d7e2dee3a4f714619101479..a4bd7fe3bc51af6b785687c4c08de3a110fe8c01 100644 (file)
--- a/helm/ocaml/mathql_interpreter/dbconn.ml
+++ b/helm/ocaml/mathql_interpreter/dbconn.ml
@@ -71,6 +71,7 @@ let pgc () =
 let init () =
    try (
     conn := Some (new Postgres.connection connection_param);
+    prerr_endline "connected."
    ) with
     _ -> raise (DBConnectionFailed ("init: " ^ connection_param))
 ;;

diff --git a/helm/ocaml/mathql_interpreter/mqint.ml b/helm/ocaml/mathql_interpreter/mqint.ml
index f0fd0a7c059172f0c99fb4004e03fe8e7a4a6a57..af3298cce4493df4696656db34c72393934b6cf0 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mqint.ml
+++ b/helm/ocaml/mathql_interpreter/mqint.ml
@@ -77,25 +77,7 @@ let see_prop_pool () =
   (match !prop_pool with Some l -> l | _ -> print_endline "ciao"; assert false)
 ;;
 
-(*
- * inizializzazione della connessione al database
- *)
-let init () =
- let _ = Dbconn.init () in
-  let c = pgc () in
-   let res = 
-    c#exec "select name,id from property where ns_id in (select id from namespace where url='http://www.cs.unibo.it/helm/schemas/mattone.rdf#')"
-   in
-    prop_pool := Some
-     (
-      List.map
-       (function
-           a::b::_ -> (a, b)
-         | _       -> print_endline "no"; assert false
-       )
-       res#get_list
-     )
-;;
+
 
 let get_prop_id prop =
  if prop="refObj" then "F"
@@ -250,38 +232,30 @@ let execute q =
     MQList qq -> xres_to_res (execute_ex [] qq)
 ;;
 
-(*
- * chiusura della connessione al database
- *)
-let close () = Dbconn.close ();;
+let prop_pool = ref None;;
 
 *****************************************************************************)
 
-let prop_pool = ref None;;
-
+let init () = Dbconn.init () 
 (*
- * inizializzazione della connessione al database
-  *)
-  
-
-let init () =
- let _ = Dbconn.init () in
-  let c = pgc () in
-   let res =
-    c#exec "select name,id from property where ns_id in (select id from namespace where url='http://www.cs.unibo.it/helm/schemas/mattone.rdf#')"
+   let c = pgc () in
+   let res = 
+      c#exec "select name,id from property where ns_id in (select id from namespace where url='http://www.cs.unibo.it/helm/schemas/mattone.rdf#')"
    in
    prop_pool := Some
-   (
-    List.map
-    (function
-      a::b::_ -> (a, b)
-      | _       -> print_endline "no"; assert false
-    )
-     res#get_list
-   )
-                                                                         
+     (
+      List.map
+       (function
+           a::b::_ -> (a, b)
+         | _       -> print_endline "no"; assert false
+       )
+       res#get_list
+     )
+*) 
 
+let close () = Dbconn.close ()
 
+let check () = Dbconn.pgc ()
 
 exception BooleExpTrue
 

diff --git a/helm/ocaml/mathql_interpreter/mqint.mli b/helm/ocaml/mathql_interpreter/mqint.mli
index 45e8b60efcbdc2baab270d1866b5563e287cdf3a..d86772622fad718ca2e0f247c0274d47b0e0f88a 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mqint.mli
+++ b/helm/ocaml/mathql_interpreter/mqint.mli
@@ -28,3 +28,5 @@ val init    : unit -> unit                  (* open database *)
 val execute : MathQL.query -> MathQL.result (* execute query *)
 
 val close   : unit -> unit                  (* close database *)
+
+val check   : unit -> Postgres.connection   (* controllo connessione *)