added support for multiple dtd_base_urls

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

diff --git a/helm/ocaml/getter/http_getter_common.ml b/helm/ocaml/getter/http_getter_common.ml
index bbed79722d421c58a9f2c57f57cd45486b893c7b..b1f96d8bddc13b682b37ae88813a6b8e0131cce5 100644 (file)
--- a/helm/ocaml/getter/http_getter_common.ml
+++ b/helm/ocaml/getter/http_getter_common.ml
@@ -75,38 +75,50 @@ let patch_xsl ?(via_http = true) () =
 let patch_entity ?(via_http = true) () =
   if via_http then
     fun line ->
-      Pcre.replace
-        ~pat:(sprintf "ENTITY (.*) SYSTEM\\s+\"(%s/)?"
-          (Lazy.force Http_getter_env.dtd_base_url))
-        ~templ:(sprintf "ENTITY $1 SYSTEM \"%s/getdtd?uri="
-          (Lazy.force Http_getter_env.my_own_url))
+      List.fold_left
+        (fun url s ->
+          Pcre.replace
+            ~pat:(sprintf "ENTITY (.*) SYSTEM\\s+\"(%s/)?" url)
+            ~templ:(sprintf "ENTITY $1 SYSTEM \"%s/getdtd?uri="
+              (Lazy.force Http_getter_env.my_own_url))
+            s)
         line
+        (Lazy.force Http_getter_env.dtd_base_urls)
   else
     fun line ->
-      Pcre.replace
-        ~pat:(sprintf "ENTITY (.*) SYSTEM\\s+\"(%s/)?"
-          (Lazy.force Http_getter_env.dtd_base_url))
-        ~templ:(sprintf "ENTITY $1 SYSTEM \"file://%s/"
-          (Lazy.force Http_getter_env.dtd_dir))
+      List.fold_left
+        (fun url s ->
+          Pcre.replace
+            ~pat:(sprintf "ENTITY (.*) SYSTEM\\s+\"(%s/)?" url)
+            ~templ:(sprintf "ENTITY $1 SYSTEM \"file://%s/"
+              (Lazy.force Http_getter_env.dtd_dir))
+            s)
         line
+        (Lazy.force Http_getter_env.dtd_base_urls)
 
 let patch_doctype ?(via_http = true) () =
   if via_http then
     fun line ->
-      Pcre.replace
-        ~pat:(sprintf "DOCTYPE (.*) SYSTEM\\s+\"%s/"
-          (Lazy.force Http_getter_env.dtd_base_url))
-        ~templ:(sprintf "DOCTYPE $1 SYSTEM \"%s/getdtd?uri="
-          (Lazy.force Http_getter_env.my_own_url))
+      List.fold_left
+        (fun url s ->
+          Pcre.replace
+            ~pat:(sprintf "DOCTYPE (.*) SYSTEM\\s+\"%s/" url)
+            ~templ:(sprintf "DOCTYPE $1 SYSTEM \"%s/getdtd?uri="
+              (Lazy.force Http_getter_env.my_own_url))
+            s)
         line
+        (Lazy.force Http_getter_env.dtd_base_urls)
   else
     fun line ->
-      Pcre.replace
-        ~pat:(sprintf "DOCTYPE (.*) SYSTEM\\s+\"%s/"
-          (Lazy.force Http_getter_env.dtd_base_url))
-        ~templ:(sprintf "DOCTYPE $1 SYSTEM \"file://%s/"
-          (Lazy.force Http_getter_env.dtd_dir))
+      List.fold_left
+        (fun url s ->
+          Pcre.replace
+            ~pat:(sprintf "DOCTYPE (.*) SYSTEM\\s+\"%s/" url)
+            ~templ:(sprintf "DOCTYPE $1 SYSTEM \"file://%s/"
+              (Lazy.force Http_getter_env.my_own_url))
+            s)
         line
+        (Lazy.force Http_getter_env.dtd_base_urls)
 
 let patch_dtd = patch_entity