- triciclo.conf.xml.sample ported to the latest version of Helm_registry

- annotations.{url,dir} renamed into local_library.{url,dir}

diff --git a/helm/gTopLevel/gTopLevel.ml b/helm/gTopLevel/gTopLevel.ml
index 08e6e539aa7c1eb9922c0562cb66386a4c8fb2a2..ba334ac036908b166c779037acbda0be2bb443b5 100644 (file)
--- a/helm/gTopLevel/gTopLevel.ml
+++ b/helm/gTopLevel/gTopLevel.ml
@@ -398,14 +398,14 @@ let
    let innertypesuri = UriManager.innertypesuri_of_uri uri in
     Xml.pp ~quiet:true xmlinnertypes (Some (path ^ ".types.xml")) ;
     Http_getter.register' innertypesuri
-     (Helm_registry.get "annotations.url" ^
+     (Helm_registry.get "local_library.url" ^
        Str.replace_first (Str.regexp "^cic:") ""
         (UriManager.string_of_uri innertypesuri) ^ ".xml"
      ) ;
     (* constant type / variable / mutual inductive types definition *)
     Xml.pp ~quiet:true xml (Some (path ^ ".xml")) ;
     Http_getter.register' uri
-     (Helm_registry.get "annotations.url" ^
+     (Helm_registry.get "local_library.url" ^
        Str.replace_first (Str.regexp "^cic:") ""
         (UriManager.string_of_uri uri) ^ ".xml"
      ) ;
@@ -420,7 +420,7 @@ let
         in
          Xml.pp ~quiet:true bodyxml' (Some (path ^ ".body.xml")) ;
          Http_getter.register' bodyuri
-          (Helm_registry.get "annotations.url" ^
+          (Helm_registry.get "local_library.url" ^
             Str.replace_first (Str.regexp "^cic:") ""
              (UriManager.string_of_uri bodyuri) ^ ".xml"
           )
@@ -433,7 +433,7 @@ exception OpenConjecturesStillThere;;
 exception WrongProof;;
 
 let pathname_of_annuri uristring =
- Helm_registry.get "annotations.dir" ^    
+ Helm_registry.get "local_library.dir" ^    
   Str.replace_first (Str.regexp "^cic:") "" uristring
 ;;
 

diff --git a/helm/gTopLevel/triciclo.conf.xml.sample b/helm/gTopLevel/triciclo.conf.xml.sample
index d84206e90c1173d4e90ac35c1960bab2e0c862e2..7a2a3e30503129ca37cc001c19b50eedfc208150 100644 (file)
--- a/helm/gTopLevel/triciclo.conf.xml.sample
+++ b/helm/gTopLevel/triciclo.conf.xml.sample
@@ -1,15 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <helm_registry>
-  <value key="annotations.dir">file:///home/sacerdot/miohelm/objects</value>
-  <value key="annotations.url">file:///home/sacerdot/miohelm/objects</value>
-  <value key="getter.mode">remote</value>
-  <!-- <value key="getter.url">http://localhost:58081/</value> -->
-  <value key="getter.url">http://mowgli.cs.unibo.it:58081/</value>
-  <value key="triciclo.constant_type_file">/public/sacerdot/constanttype</value>
-  <value key="triciclo.environment_file">/public/sacerdot/environment</value>
-  <value key="triciclo.inner_types_file">/public/sacerdot/innertypes</value>
-  <value key="triciclo.proof_file">/public/sacerdot/currentproof</value>
-  <value key="triciclo.proof_file_type">/public/sacerdot/currentprooftype</value>
-  <!-- <value key="uwobo.url">http://localhost:58080/</value> -->
-  <value key="uwobo.url">http://mowgli.cs.unibo.it:58080/</value>
+  <!-- These are the only settings that are likely to be changed by the user -->
+  <section name="users_settings">
+   <!-- The directory where the current proof and environment are stored -->
+   <key name="per_user_work_directory">/home/sacerdot/helm/local_stuff</key>
+
+   <!-- The URL of the host of the Getter and UWOBO -->
+   <!-- <key name="daemons_host">http://mowgli.cs.unibo.it</key> -->
+   <key name="daemons_host">http://localhost</key>
+  </section>
+
+  <!-- From now on it is unlikely that something needs to be changed -->
+  <section name="local_library">
+    <key name="dir">file://$(users_settings_per_user_work_directory)/objects</key>
+    <key name="url">$(local_library.dir)</key>
+  </section>
+  <section name="getter">
+    <key name="mode">remote</key>
+    <key name="url">$(users_settings.daemons_host):58081</key>
+  </section>
+  <section name="triciclo">
+    <key name="constant_type_file">$(users_settings.per_user_work_directory)/constanttype</key>
+    <key name="environment_file">$(users_settings.per_user_work_directory)/environment</key>
+    <key name="inner_types_file">$(users_settings.per_user_work_directory)/innertypes</key>
+    <key name="proof_file">$(users_settings.per_user_work_directory)/currentproof</key>
+    <key name="proof_file_type">$(users_settings.per_user_work_directory)/currentprooftype</key>
+  </section>
+  <section name="uwobo">
+    <key name="url">$(users_settings.daemons_host):58080/</key>
+  </section>
 </helm_registry>