- label name changes: s/patch_dtd/patch because "patch_dtd" isn't really

  appropriate for XSL and DTD patching
GET query argument still remaint "patch_dtd" for backward compatibility

diff --git a/helm/http_getter/http_getter.ml b/helm/http_getter/http_getter.ml
index e03817a22b9f7f68a6cfcf1becc2a1df9884cf43..deefa047e51a7bc43069526dab8fddcc57acf01a 100644 (file)
--- a/helm/http_getter/http_getter.ml
+++ b/helm/http_getter/http_getter.ml
@@ -48,7 +48,7 @@ let parse_enc (req: Http_types.request) =
     | s -> raise (Http_getter_bad_request ("Invalid format: " ^ s)))
   with Http_types.Param_not_found _ -> Enc_normal
 ;;
-let parse_patch_dtd (req: Http_types.request) =
+let parse_patch (req: Http_types.request) =
   match req#param "patch_dtd" with
   | s when String.lowercase s = "yes" -> true
   | s when String.lowercase s = "no" -> false
@@ -318,22 +318,22 @@ let callback (req: Http_types.request) outchan =
         match req#path with
         | "/getxml" ->
             let enc = parse_enc req in
-            let patch_dtd =
-              try parse_patch_dtd req with Http_types.Param_not_found _ -> true
+            let patch =
+              try parse_patch req with Http_types.Param_not_found _ -> true
             in
             Http_getter_cache.respond_xml
-              ~url:(resolve uri) ~uri ~enc ~patch_dtd outchan
+              ~url:(resolve uri) ~uri ~enc ~patch outchan
         | "/getxslt" ->
-            let patch_dtd =
-              try parse_patch_dtd req with Http_types.Param_not_found _ -> true
+            let patch =
+              try parse_patch req with Http_types.Param_not_found _ -> true
             in
-            Http_getter_cache.respond_xsl ~url:(resolve uri) ~patch_dtd outchan
+            Http_getter_cache.respond_xsl ~url:(resolve uri) ~patch outchan
         | "/getdtd" ->
-            let patch_dtd =
-              try parse_patch_dtd req with Http_types.Param_not_found _ -> true
+            let patch =
+              try parse_patch req with Http_types.Param_not_found _ -> true
             in
             Http_getter_cache.respond_dtd
-              ~patch_dtd ~url:(Http_getter_env.dtd_dir ^ "/" ^ uri) outchan
+              ~patch ~url:(Http_getter_env.dtd_dir ^ "/" ^ uri) outchan
         | "/resolve" ->
             (try
               return_xml_msg

diff --git a/helm/http_getter/http_getter_cache.ml b/helm/http_getter/http_getter_cache.ml
index faa0c014a6491c50a0550b203a00bfadcb50c254..8d180e1f86a18c52eeda7adac40a614583487947 100644 (file)
--- a/helm/http_getter/http_getter_cache.ml
+++ b/helm/http_getter/http_getter_cache.ml
@@ -44,7 +44,7 @@ let is_in_cache basename =
     | Enc_normal -> basename
     | Enc_gzipped -> basename ^ ".gz")
 
-let respond_xml ?(enc = Enc_normal) ?(patch_dtd = true) ~url ~uri outchan =
+let respond_xml ?(enc = Enc_normal) ?(patch = true) ~url ~uri outchan =
   let resource_type = resource_type_of_url url in
   let extension = extension_of_resource_type resource_type in
   let downloadname =
@@ -66,7 +66,7 @@ let respond_xml ?(enc = Enc_normal) ?(patch_dtd = true) ~url ~uri outchan =
           Http_getter_env.rdf_dir escaped_prefix baseuri extension
   in
   let patch_fun =
-    if patch_dtd then Http_getter_common.patch_xml else (fun x -> x)
+    if patch then Http_getter_common.patch_xml else (fun x -> x)
   in
   let basename = Pcre.replace ~pat:"\\.gz$" downloadname in
   if not (is_in_cache basename) then begin (* download and fill cache *)
@@ -100,9 +100,9 @@ let respond_xml ?(enc = Enc_normal) ?(patch_dtd = true) ~url ~uri outchan =
   | Enc_gzipped, Enc_normal -> Sys.remove (basename ^ ".gz")
 
   (* TODO enc is not yet supported *)
-let respond_xsl ?(enc = Enc_normal) ?(patch_dtd = true) ~url outchan =
+let respond_xsl ?(enc = Enc_normal) ?(patch = true) ~url outchan =
   let patch_fun =
-    if patch_dtd then Http_getter_common.patch_xsl else (fun x -> x)
+    if patch then Http_getter_common.patch_xsl else (fun x -> x)
   in
   let fname = tempfile () in
   wget ~output:fname url;
@@ -110,9 +110,9 @@ let respond_xsl ?(enc = Enc_normal) ?(patch_dtd = true) ~url outchan =
   Sys.remove fname
 
   (* TODO enc is not yet supported *)
-let respond_dtd ?(enc = Enc_normal) ?(patch_dtd = true) ~url outchan =
+let respond_dtd ?(enc = Enc_normal) ?(patch = true) ~url outchan =
   let patch_fun =
-    if patch_dtd then Http_getter_common.patch_dtd else (fun x -> x)
+    if patch then Http_getter_common.patch_dtd else (fun x -> x)
   in
   if Sys.file_exists url then
     (* TODO check this: old getter here used text/xml *)

diff --git a/helm/http_getter/http_getter_cache.mli b/helm/http_getter/http_getter_cache.mli
index 0c477637c9d92e6a3380aa5e9c018ccbb842a082..def1c75973057d3ef4849f7a5fb3285f1b1ade6a 100644 (file)
--- a/helm/http_getter/http_getter_cache.mli
+++ b/helm/http_getter/http_getter_cache.mli
@@ -27,17 +27,17 @@
 open Http_getter_types;;
 
 val respond_xml:
-  ?enc:http_getter_encoding -> ?patch_dtd:bool -> url:string -> uri:string ->
+  ?enc:http_getter_encoding -> ?patch:bool -> url:string -> uri:string ->
   out_channel ->
     unit
 
 val respond_xsl:
-  ?enc:http_getter_encoding -> ?patch_dtd:bool -> url:string ->
+  ?enc:http_getter_encoding -> ?patch:bool -> url:string ->
   out_channel ->
     unit
 
 val respond_dtd:
-  ?enc:http_getter_encoding -> ?patch_dtd:bool -> url:string ->
+  ?enc:http_getter_encoding -> ?patch:bool -> url:string ->
   out_channel ->
     unit