bugfix: remove trailing slashes from dtd_base_urls

[helm.git] / helm / ocaml / getter / http_getter_env.ml

diff --git a/helm/ocaml/getter/http_getter_env.ml b/helm/ocaml/getter/http_getter_env.ml
index fa3216dccb005ee65e230f1923134777d5cf78f8..a7fe6be91d14701a69e0a150b31488a370e9c870 100644 (file)
--- a/helm/ocaml/getter/http_getter_env.ml
+++ b/helm/ocaml/getter/http_getter_env.ml
@@ -47,8 +47,10 @@ let cic_dir         = lazy (Helm_registry.get "getter.cic_dir")
 let nuprl_dir       = lazy (Helm_registry.get "getter.nuprl_dir")
 let rdf_dir         = lazy (Helm_registry.get "getter.rdf_dir")
 let dtd_dir         = lazy (Helm_registry.get "getter.dtd_dir")
-let dtd_base_urls   = lazy (Helm_registry.get_string_list
-                              "getter.dtd_base_urls")
+let dtd_base_urls   = lazy (
+  let rex = Pcre.regexp "/*$" in
+  let raw_urls = Helm_registry.get_string_list "getter.dtd_base_urls" in
+  List.map (Pcre.replace ~rex) raw_urls)
 let port            = lazy (Helm_registry.get_int "getter.port")
 
 let _servers = ref None
@@ -122,6 +124,8 @@ dtd_base_urls:\t%s
 cache_mode:\t%s
 servers:
 \t%s
+log_file:\t%s
+log_level:\t%d
 "
     version (Lazy.force cic_dbm) (Lazy.force nuprl_dbm) (Lazy.force rdf_dbm)
     (Lazy.force xsl_dbm) (Lazy.force xml_index)
@@ -136,6 +140,8 @@ servers:
     (String.concat "\n\t" (* (position * server) list *)
       (List.map (fun (pos, server) -> sprintf "%3d: %s" pos server)
         (servers ())))
+    (match Http_getter_logger.get_log_file () with None -> "None" | Some f -> f)
+    (Http_getter_logger.get_log_level ())
 
 let add_server ?position url =
   let new_servers =