X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fgetter%2Fhttp_getter_common.ml;h=03f5c2a2ad19e06ff7564ba36c3d9df4b00a86d1;hb=4cc248707314a05902ce8d70ceea1ac0541f9976;hp=6ecc75f8155edcc952b4ff7725423ab0cf1bb833;hpb=384c369d4cbf5dd6cf1013902d3a218260400e73;p=helm.git diff --git a/helm/ocaml/getter/http_getter_common.ml b/helm/ocaml/getter/http_getter_common.ml index 6ecc75f81..03f5c2a2a 100644 --- a/helm/ocaml/getter/http_getter_common.ml +++ b/helm/ocaml/getter/http_getter_common.ml @@ -31,8 +31,8 @@ open Printf;; let string_of_ls_flag = function No -> "NO" | Yes -> "YES" | Ann -> "ANN" let string_of_encoding = function - | Enc_normal -> "Normal" - | Enc_gzipped -> "GZipped" + | `Normal -> "Normal" + | `Gzipped -> "GZipped" let is_cic_obj_uri uri = Pcre.pmatch ~pat:"^cic:" uri let is_theory_uri uri = Pcre.pmatch ~pat:"^theory:" uri @@ -58,50 +58,45 @@ let rec uri_of_string = function Cic_uri (Theory (Pcre.replace ~pat:"^theory:" uri)) | uri -> raise (Invalid_URI uri) -let patch_xml 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 -let patch_xsl line = - let mk_patch_fun tag line = - Pcre.replace - ~pat:(sprintf "%s\\s+href=\"" tag) - ~templ:(sprintf "%s href=\"%s/getxslt?uri=" - tag (Lazy.force Http_getter_env.my_own_url)) - line +let patch_xsl ?(via_http = true) () = + fun line -> + let mk_patch_fun tag line = + Pcre.replace + ~pat:(sprintf "%s\\s+href=\"" tag) + ~templ:(sprintf "%s href=\"%s/getxslt?uri=" + tag (Lazy.force Http_getter_env.my_own_url)) + line + in + let (patch_import, patch_include) = + (mk_patch_fun "xsl:import", mk_patch_fun "xsl:include") + in + patch_include (patch_import 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 (patch_import, patch_include) = - (mk_patch_fun "xsl:import", mk_patch_fun "xsl:include") + 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 - patch_include (patch_import line) -let patch_dtd line = - Pcre.replace - ~pat:"ENTITY (.*) SYSTEM\\s+\"" - ~templ:(sprintf "ENTITY $1 SYSTEM \"%s/getdtd?uri=" - (Lazy.force Http_getter_env.my_own_url)) - line + fun line -> Pcre.replace ~rex ~templ line -let pp_error s = - sprintf "Http Getter error: %s" s -let pp_internal_error s = - sprintf "Http Getter Internal error: %s" s -let pp_msg s = sprintf "%s" s -let null_pp s = s +let patch_entity = patch_system "ENTITY" +let patch_doctype = patch_system "DOCTYPE" -let mk_return_fun pp_fun contype msg outchan = - Http_daemon.respond - ~body:(pp_fun msg) ~headers:["Content-Type", contype] outchan +let patch_dtd = patch_entity +let patch_xml ?via_http () line = + patch_doctype ?via_http () (patch_entity ?via_http () line) -let return_html_error = mk_return_fun pp_error "text/html" -let return_html_internal_error = mk_return_fun pp_internal_error "text/html" -let return_html_msg = mk_return_fun pp_msg "text/html" -let return_html_raw = mk_return_fun null_pp "text/html" -let return_xml_raw = mk_return_fun null_pp "text/xml" let return_file - ~fname ?contype ?contenc ?(patch_fun = fun x -> x) ?(gunzip = false) outchan + ~fname ?contype ?contenc + ?(patch_fun = fun x -> x) ?(gunzip = false) ?(via_http = true) outchan = let headers = match (contype, contenc) with @@ -110,29 +105,37 @@ let return_file | (None, Some e) -> ["Content-Encoding", e] | (None, None) -> [] in - Http_daemon.send_basic_headers ~code:200 outchan; - Http_daemon.send_headers headers outchan; - Http_daemon.send_CRLF outchan; + if via_http then begin + Http_daemon.send_basic_headers ~code:200 outchan; + Http_daemon.send_headers headers outchan; + Http_daemon.send_CRLF outchan + end; if gunzip then begin (* gunzip needed, uncompress file, apply patch_fun to it, compress the result and sent it to client *) let (tmp1, tmp2) = (Http_getter_misc.tempfile (), Http_getter_misc.tempfile ()) in - Http_getter_misc.gunzip ~keep:true ~output:tmp1 fname; (* gunzip to tmp1 *) - let new_file = open_out tmp2 in - Http_getter_misc.iter_file (* tmp2 = patch(tmp1) *) - (fun line -> output_string new_file (patch_fun line ^ "\n")) - tmp1; - close_out new_file; - Http_getter_misc.gzip ~output:tmp1 tmp2; (* tmp1 = gzip(tmp2); rm tmp2 *) - Http_getter_misc.iter_file (* send tmp1 to client as is*) - (fun line -> output_string outchan (line ^ "\n")) - tmp1; - Sys.remove tmp1 (* rm tmp1 *) - end else (* no need to gunzip, apply patch_fun directly to file *) + try + Http_getter_misc.gunzip ~keep:true ~output:tmp1 fname;(* gunzip to tmp1 *) + let new_file = open_out tmp2 in + Http_getter_misc.iter_file (* tmp2 = patch(tmp1) *) + (fun line -> + output_string new_file (patch_fun line ^ "\n"); + flush outchan) + tmp1; + close_out new_file; + Http_getter_misc.gzip ~output:tmp1 tmp2; (* tmp1 = gzip(tmp2); rm tmp2 *) + Http_getter_misc.iter_file (* send tmp1 to client as is*) + (fun line -> output_string outchan (line ^ "\n"); flush outchan) + tmp1; + Sys.remove tmp1 (* rm tmp1 *) + with e -> + Sys.remove tmp1; + raise e + end else begin (* no need to gunzip, apply patch_fun directly to file *) Http_getter_misc.iter_file - (fun line -> output_string outchan (patch_fun line ^ "\n")) - fname + (fun line -> output_string outchan (patch_fun line ^ "\n"); flush outchan) + fname; + end ;; -let return_400 body outchan = Http_daemon.respond_error ~code:400 ~body outchan