- added debugging log messages in g{,un}zip

[helm.git] / helm / http_getter / http_getter_env.ml

diff --git a/helm/http_getter/http_getter_env.ml b/helm/http_getter/http_getter_env.ml
index 20f67ae274897171718ba7f4b0c7d587d8a73446..217ec346ee39c2c80c414eb5b0fdbf40f400972c 100644 (file)
--- a/helm/http_getter/http_getter_env.ml
+++ b/helm/http_getter/http_getter_env.ml
@@ -32,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 *)
@@ -44,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 =
@@ -119,7 +121,9 @@ let reload () =
 
 let dump_env () =
   printf
-"xml_dbm:\t%s
+"HTTP Getter %s (the OCaml one!)
+
+xml_dbm:\t%s
 rdf_dbm:\t%s
 xsl_dbm:\t%s
 xml_index:\t%s
@@ -139,9 +143,8 @@ 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 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
     (match cache_mode with Enc_normal -> "Normal" | Enc_gzipped -> "GZipped")
     conf_file conf_dir (String.concat "\n\t" !servers);
   flush stdout