X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FgTopLevel.ml;h=5df73dc1cacbc71b3fb61443838829c32582888c;hb=9b0237f419714f67bfe4ae0cdee2c59986588e50;hp=ba334ac036908b166c779037acbda0be2bb443b5;hpb=883959e875abadf3336e1a93292bc1fcc8f92696;p=helm.git

diff --git a/helm/gTopLevel/gTopLevel.ml b/helm/gTopLevel/gTopLevel.ml
index ba334ac03..5df73dc1c 100644
--- a/helm/gTopLevel/gTopLevel.ml
+++ b/helm/gTopLevel/gTopLevel.ml
@@ -48,13 +48,21 @@ module MQGT = MQGTypes
 module MQGU = MQGUtil
 module MQG  = MQueryGenerator
 
-(* GLOBAL CONSTANTS *)
 
-let configuration_file = "triciclo.conf.xml"
+(* first of all let's initialize the Helm_registry *)
+let _ =
+ let configuration_file = "gTopLevel.conf.xml" in
+  if not (Sys.file_exists configuration_file) then begin
+    eprintf "E: Can't find configuration file '%s'\n" configuration_file;
+    exit 2
+  end;
+ Helm_registry.load_from configuration_file
+;;
+
+(* GLOBAL CONSTANTS *)
 
 let mqi_debug_fun s = debug_print ~level:2 s
-let mqi_flags = [MQIC.Postgres ; MQIC.Stat ; MQIC.Warn ; MQIC.Log]
-let mqi_handle = MQIC.init mqi_flags mqi_debug_fun
+let mqi_handle = MQIC.init ~log:mqi_debug_fun ()
 
 let xlinkns = Gdome.domString "http://www.w3.org/1999/xlink";;
 
@@ -371,7 +379,7 @@ let interactive_interpretation_choice interpretations =
  GtkThread.main ();
  match !chosen with
     None -> raise NoChoice
-  | Some n -> n
+  | Some n -> [n]
 ;;
 
 
@@ -484,8 +492,8 @@ let qed () =
   (** save an unfinished proof on the filesystem *)
 let save_unfinished_proof () =
  let (xml, bodyxml) = ProofEngine.get_current_status_as_xml () in
- let proof_file_type = Helm_registry.get "triciclo.proof_file_type" in
- let proof_file = Helm_registry.get "triciclo.proof_file" in
+ let proof_file_type = Helm_registry.get "gtoplevel.proof_file_type" in
+ let proof_file = Helm_registry.get "gtoplevel.proof_file" in
  Xml.pp ~quiet:true xml (Some proof_file_type) ;
  HelmLogger.log
   (`Msg (`T ("Current proof type saved to " ^ proof_file_type))) ;
@@ -676,8 +684,8 @@ let load_unfinished_proof () =
       None -> raise NoChoice
     | Some uri0 ->
        let uri = UriManager.uri_of_string ("cic:" ^ uri0) in
-       let proof_file_type = Helm_registry.get "triciclo.proof_file_type" in
-       let proof_file = Helm_registry.get "triciclo.proof_file" in
+       let proof_file_type = Helm_registry.get "gtoplevel.proof_file_type" in
+       let proof_file = Helm_registry.get "gtoplevel.proof_file" in
         match CicParser.obj_of_xml proof_file_type (Some proof_file) with
            Cic.CurrentProof (_,metasenv,bo,ty,_) ->
             typecheck_loaded_proof metasenv bo ty ;
@@ -2585,7 +2593,7 @@ end
 
 let dump_environment () =
   try
-    let oc = open_out (Helm_registry.get "triciclo.environment_file") in
+    let oc = open_out (Helm_registry.get "gtoplevel.environment_file") in
     HelmLogger.log (`Msg (`T "Dumping environment ..."));
     CicEnvironment.dump_to_channel oc;
     HelmLogger.log (`Msg (`T "... done!")) ;
@@ -2597,7 +2605,7 @@ let dump_environment () =
 ;;
 let restore_environment () =
   try
-    let ic = open_in (Helm_registry.get "triciclo.environment_file") in
+    let ic = open_in (Helm_registry.get "gtoplevel.environment_file") in
     HelmLogger.log (`Msg (`T "Restoring environment ... "));
     CicEnvironment.restore_from_channel ic;
     HelmLogger.log (`Msg (`T "... done!"));
@@ -2835,11 +2843,6 @@ end
 (* MAIN *)
 
 let initialize_everything () =
-  if not (Sys.file_exists configuration_file) then begin
-    eprintf "E: Can't find configuration file '%s'\n" configuration_file;
-    exit 2
-  end;
-  Helm_registry.load_from configuration_file;
   let output = TermViewer.proof_viewer ~width:350 ~height:280 () in
   let notebook = new notebook in
   let rendering_window' = new rendering_window output notebook in
@@ -2853,7 +2856,7 @@ let initialize_everything () =
     (Some (print_error_as_html "XSLT Debug Message: "));
   rendering_window'#show () ;
   if restore_environment_on_boot &&
-    Sys.file_exists (Helm_registry.get "triciclo.environment_file")
+    Sys.file_exists (Helm_registry.get "gtoplevel.environment_file")
   then
     restore_environment ();
   GtkThread.main ()