X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fhttp_getter_env.ml;h=7b59cf1220f6c8c63eeecd8755d6bcdc7afb638d;hb=cf78c8f8227bebbcaa6d6e2c51b26661c3dbfccf;hp=e97c89cbfb1b36be4fe3b678da31cc88234f77ef;hpb=67b126ded904b0388bb32039d3217fa37099d33f;p=helm.git

diff --git a/helm/http_getter/http_getter_env.ml b/helm/http_getter/http_getter_env.ml
index e97c89cbf..7b59cf122 100644
--- a/helm/http_getter/http_getter_env.ml
+++ b/helm/http_getter/http_getter_env.ml
@@ -1,5 +1,7 @@
 (*
- *  Copyright (C) 2003, HELM Team.
+ * Copyright (C) 2003:
+ *    Stefano Zacchiroli <zack@cs.unibo.it>
+ *    for the HELM Team http://helm.cs.unibo.it/
  *
  *  This file is part of HELM, an Hypertextual, Electronic
  *  Library of Mathematics, developed at the Computer Science
@@ -21,7 +23,7 @@
  *  MA  02111-1307, USA.
  *
  *  For details, see the HELM World-Wide-Web page,
- *  http://cs.unibo.it/helm/.
+ *  http://helm.cs.unibo.it/
  *)
 
 open Http_getter_types;;
@@ -30,6 +32,8 @@ open Pxp_document;;
 open Pxp_types;;
 open Pxp_yacc;;
 
+let version = Http_getter_const.version
+
 type setting_src =
   | Environment (* read setting from environment variables *)
   | Conffile    (* read setting from configuration file *)
@@ -42,7 +46,7 @@ let (conf_file, conf_dir) =
     let conf_dir =
       Pcre.replace ~pat:"/$" (Sys.getenv "HELM_CONFIGURATION_DIR")
     in
-    (conf_dir ^ "/configuration.xml", conf_dir)
+    (conf_dir ^ "/" ^ Http_getter_const.conffile, conf_dir)
   with Not_found -> failwith "HELM_CONFIGURATION_DIR undefined"
 
 let safe_getenv ?(from = Both) var =
@@ -74,18 +78,24 @@ let safe_getenv ?(from = Both) var =
 
 let servers_file = safe_getenv "HTTP_GETTER_SERVERS_FILE"
 let parse_servers () =
-  (let cons hd tl = hd @ [ tl ] in
-  Http_getter_misc.fold_file cons [] servers_file)
+  List.rev (Http_getter_misc.fold_file
+    (fun servers line ->
+      if Http_getter_misc.is_blank_line line then servers else line::servers)
+    []
+    servers_file)
+;;
 let servers = ref (parse_servers ())
 let reload_servers () = servers := parse_servers ()
 
-let xml_dbm = safe_getenv "HTTP_GETTER_XML_DBM"
+let cic_dbm = safe_getenv "HTTP_GETTER_CIC_DBM"
+let nuprl_dbm = safe_getenv "HTTP_GETTER_NUPRL_DBM"
 let rdf_dbm = safe_getenv "HTTP_GETTER_RDF_DBM"
 let xsl_dbm = safe_getenv "HTTP_GETTER_XSL_DBM"
 let xml_index = safe_getenv "HTTP_GETTER_XML_INDEXNAME"
 let rdf_index = safe_getenv "HTTP_GETTER_RDF_INDEXNAME"
 let xsl_index = safe_getenv "HTTP_GETTER_XSL_INDEXNAME"
-let xml_dir = safe_getenv "HTTP_GETTER_XML_DIR"
+let cic_dir = safe_getenv "HTTP_GETTER_CIC_DIR"
+let nuprl_dir = safe_getenv "HTTP_GETTER_NUPRL_DIR"
 let rdf_dir = safe_getenv "HTTP_GETTER_RDF_DIR"
 let dtd_dir = safe_getenv "HTTP_GETTER_DTD_DIR"
 
@@ -115,15 +125,19 @@ let cache_mode =
 let reload () =
   reload_servers ()
 
-let dump_env () =
-  printf
-"xml_dbm:\t%s
+let env_to_string () =
+  sprintf
+"HTTP Getter %s (the OCaml one!)
+
+cic_dbm:\t%s
+nuprl_dbm:\t%s
 rdf_dbm:\t%s
 xsl_dbm:\t%s
 xml_index:\t%s
 rdf_index:\t%s
 xsl_index:\t%s
-xml_dir:\t%s
+cic_dir:\t%s
+nuprl_dir:\t%s
 rdf_dir:\t%s
 dtd_dir:\t%s
 servers_file:\t%s
@@ -137,10 +151,24 @@ conf_dir:\t%s
 servers:
 \t%s
 "
-    xml_dbm rdf_dbm xsl_dbm xml_index rdf_index xsl_index
-    xml_dir rdf_dir dtd_dir servers_file host port
-    my_own_url dtd_base_url
+    version cic_dbm nuprl_dbm rdf_dbm xsl_dbm xml_index rdf_index xsl_index
+    cic_dir nuprl_dir rdf_dir dtd_dir servers_file host port my_own_url
+    dtd_base_url
     (match cache_mode with Enc_normal -> "Normal" | Enc_gzipped -> "GZipped")
-    conf_file conf_dir (String.concat "\n\t" !servers);
-  flush stdout
+    conf_file conf_dir
+    (String.concat "\n\t" (* servers list prepended with server number *)
+      (List.map
+        (let idx = ref ~-1 in
+        fun server -> incr idx; sprintf "%3d: %s" !idx server)
+        !servers))
+
+let add_server ?position url =
+  (match position with
+  | Some p -> Http_getter_misc.add_line ~fname:servers_file ~position:p url
+  | None -> Http_getter_misc.add_line ~fname:servers_file url);
+  reload_servers ()
+
+let remove_server position =
+  Http_getter_misc.remove_line ~fname:servers_file position;
+  reload_servers ()