Time misurations patched.

[helm.git] / helm / gTopLevel / topLevel / topLevel.ml

diff --git a/helm/gTopLevel/topLevel/topLevel.ml b/helm/gTopLevel/topLevel/topLevel.ml
index 57c9d41bf6d1c280f45b5e584acbc2b293e4ca43..16d28dc01181e6f504e6b2af46cb94cf666622b1 100644 (file)
--- a/helm/gTopLevel/topLevel/topLevel.ml
+++ b/helm/gTopLevel/topLevel/topLevel.ml
@@ -1,3 +1,5 @@
+let connection_param = "host=mowgli.cs.unibo.it dbname=helm user=helm"
+
 let show_queries = ref false
 
 let use_db = ref true
@@ -8,14 +10,15 @@ let nl = " <p>\n"
 
 let check_db () =
    if ! db_down then 
-      if ! use_db then begin Mqint.init (); db_down := false; true end 
+      if ! use_db then begin Mqint.init connection_param; db_down := false; true end 
       else begin print_endline "Not issuing in restricted mode"; false end
    else true
 
 let default_confirm q =
    let module Util = MQueryUtil in   
    if ! show_queries then print_string (Util.text_of_query q ^ nl);
-   check_db ()
+   let b = check_db () in
+   if ! db_down then print_endline "db_down"; b 
 
 let get_terms () =
    let terms = ref [] in
@@ -46,6 +49,10 @@ let pp_type_of uri =
 *)
    in print_endline s; flush stdout
 
+let dbc () =
+   let on = check_db () in 
+   if on then ignore (Mqint.check ())
+
 let rec display = function
    | []           -> ()
    | term :: tail -> 
@@ -125,6 +132,7 @@ let prerr_help () =
    prerr_endline "OPTIONS:\n";
    prerr_endline "-h  -help               shows this help message";
    prerr_endline "-q  -show-queries       outputs the generated queries";
+   prerr_endline "-c  -db-check           checks the database connection";
    prerr_endline "-r  -restricted -nodb   enables restricted mode: queries are not issued";
    prerr_endline "-t  -typeof URI         outputs the CIC type of the given HELM object";
    prerr_endline "-x  -execute            issues a query given in the input file";
@@ -148,6 +156,7 @@ let parse_args () =
       | ("-x"|"-execute") :: rem -> execute stdin; parse rem
       | ("-q"|"-show-queries") :: rem -> show_queries := true; parse rem
       | ("-r"|"-restricted"|"-nodb") :: rem -> use_db := false; parse rem
+      | ("-c"|"-db-check") :: rem -> dbc (); parse rem
       | ("-L"|"-locate") :: arg :: rem -> locate arg; parse rem
       | ("-B"|"-backward") :: arg :: rem ->
          let m = (int_of_string arg) in