added extra "id" parameter for input_or_locate_uri callback

[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..03f5c2a2ad19e06ff7564ba36c3d9df4b00a86d1 100644 (file)
--- a/helm/ocaml/getter/http_getter_common.ml
+++ b/helm/ocaml/getter/http_getter_common.ml
@@ -72,44 +72,25 @@ let patch_xsl ?(via_http = true) () =
     in
     patch_include (patch_import line)
 
-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))
-        line
-  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))
-        line
+let patch_system kind ?(via_http = true) () =
+  let rex =
+    Pcre.regexp (sprintf "%s (.*) SYSTEM\\s+\"((%s)/)?" kind
+      (String.concat "|" (Lazy.force Http_getter_env.dtd_base_urls)))
+  in
+  let templ =
+    if via_http then
+      sprintf "%s $1 SYSTEM \"%s/getdtd?uri=" kind
+        (Lazy.force Http_getter_env.my_own_url)
+    else
+      sprintf "%s $1 SYSTEM \"file://%s/" kind
+        (Lazy.force Http_getter_env.dtd_dir)
+  in
+  fun line -> Pcre.replace ~rex ~templ line
 
-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))
-        line
-  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))
-        line
+let patch_entity = patch_system "ENTITY"
+let patch_doctype = patch_system "DOCTYPE"
 
 let patch_dtd = patch_entity
-
 let patch_xml ?via_http () line =
   patch_doctype ?via_http () (patch_entity ?via_http () line)