made "dtd_dir" optional, is needed only by the web server, not by matita

[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 7a3891b98c63a803606b8d6c44867f558dff58d6..79b0ab42ed927e36eca9d33a7b750f5911b40419 100644 (file)
--- a/helm/ocaml/getter/http_getter_env.ml
+++ b/helm/ocaml/getter/http_getter_env.ml
@@ -38,7 +38,10 @@ let version = Http_getter_const.version
 let prefix_RE = Pcre.regexp "^\\s*([^\\s]+)\\s+([^\\s]+)\\s*(.*)$"
 
 let cache_dir  = lazy (normalize_dir (Helm_registry.get "getter.cache_dir"))
-let dtd_dir = lazy (normalize_dir (Helm_registry.get "getter.dtd_dir"))
+let dtd_dir = lazy (
+  match Helm_registry.get_opt Helm_registry.get_string "getter.dtd_dir" with
+  | None -> None
+  | Some dir -> Some (normalize_dir dir))
 let dtd_base_urls  = lazy (
   let rex = Pcre.regexp "/*$" in
   let raw_urls =
@@ -107,8 +110,14 @@ log_level:\t%d
 "
     version
     (pp_prefixes (Lazy.force prefixes))
-    (Lazy.force dtd_dir) (Lazy.force host) (Lazy.force port)
+    (match Lazy.force dtd_dir with Some dir -> dir | None -> "NONE")
+    (Lazy.force host) (Lazy.force port)
     (Lazy.force my_own_url) (String.concat " " (Lazy.force dtd_base_urls))
     (match Http_getter_logger.get_log_file () with None -> "None" | Some f -> f)
     (Http_getter_logger.get_log_level ())
 
+let get_dtd_dir () =
+  match Lazy.force dtd_dir with
+  | None -> raise (Internal_error "dtd_dir is not available")
+  | Some dtd_dir -> dtd_dir
+