(*
- * Copyright (C) 2000, HELM Team.
+ * Copyright (C) 2003:
+ * Stefano Zacchiroli <zack@cs.unibo.it>
+ * for the HELM Team http://helm.cs.unibo.it/
*
* This file is part of HELM, an Hypertextual, Electronic
* Library of Mathematics, developed at the Computer Science
* MA 02111-1307, USA.
*
* For details, see the HELM World-Wide-Web page,
- * http://cs.unibo.it/helm/.
+ * http://helm.cs.unibo.it/
*)
open Http_getter_types;;
Pcre.replace
~pat:(sprintf "%s\\s+href=\"" tag)
~templ:(
- sprintf "%s href=\"%s/getxslt?uri=" Http_getter_env.my_own_url tag)
+ sprintf "%s href=\"%s/getxslt?uri=" tag Http_getter_env.my_own_url)
line
in
let (patch_import, patch_include) =
sprintf "ENTITY $1 SYSTEM \"%s/getdtd?uri=" Http_getter_env.my_own_url)
line
-let pp_error =
- sprintf "<html><body><h1>Http Getter error: %s</h1></body></html>"
-let pp_internal_error =
- sprintf "<html><body><h1>Http Getter Internal error: %s</h1></body></html>"
-let pp_msg = sprintf "<html><body><h1>%s</h1></body></html>"
+let pp_error s =
+ sprintf "<html><body><h1>Http Getter error: %s</h1></body></html>" s
+let pp_internal_error s =
+ sprintf "<html><body><h1>Http Getter Internal error: %s</h1></body></html>" s
+let pp_msg s = sprintf "<html><body><h1>%s</h1></body></html>" s
+let null_pp s = s
let mk_return_fun pp_fun contype msg outchan =
Http_daemon.respond
- ~body:(pp_fun msg)
- ~headers:["Content-Type", contype]
- outchan
+ ~body:(pp_fun msg) ~headers:["Content-Type", contype] outchan
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_xml_msg = mk_return_fun pp_msg "text/xml"
- (**
- @param fname name of the file to be sent
- @param contype Content-Type header value
- @param contenc Content-Enconding header value
- @param patch_fun function used to patch file contents
- @param outchan output channel over which sent file fname *)
+let return_xml_msg = mk_return_fun null_pp "text/xml"
let return_file ~fname ?contype ?contenc ?(patch_fun = fun x -> x) outchan =
let headers =
match (contype, contenc) with
- | (Some t, Some e) -> [ "Content-Type", t; "Content-Enconding", e ]
- | (Some t, None) -> [ "Content-Type" , t ]
- | (None, Some e) -> [ "Content-Enconding", e ]
+ | (Some t, Some e) -> ["Content-Encoding", e; "Content-Type", t]
+ | (Some t, None) -> ["Content-Type" , t]
+ | (None, Some e) -> ["Content-Encoding", e]
| (None, None) -> []
in
- Http_daemon.send_basic_headers outchan;
+ Http_daemon.send_basic_headers ~code:200 outchan;
Http_daemon.send_headers headers outchan;
Http_daemon.send_CRLF outchan;
Http_getter_misc.iter_file
(fun line -> output_string outchan (patch_fun line ^ "\n"))
fname
- (* return a bad request http response *)
let return_400 body outchan = Http_daemon.respond_error ~code:400 ~body outchan
-let wget ?output url =
- let flags =
- (match output with Some file -> ["-O " ^ file] | None -> []) @ [url]
- in
- Shell.call
- ~stdout:Shell.to_dev_null ~stderr:Shell.to_dev_null [Shell.cmd "wget" flags]
-
- (* TODO gzip and gunzip create executables file, but umask seems to be
- correctly inherited from the shell .... boh *)
-
- (* stderr shown as usual *)
-let gzip ?(keep = false) fname =
- if keep then (* keep original file *)
- Shell.call
- ~stdout:(Shell.to_file (fname ^ ".gz"))
- [Shell.cmd "gzip" ["-f"; "-c"; fname]]
- else (* don't keep original file *)
- Shell.call [Shell.cmd "gzip" ["-f"; fname]]
-
- (* stderr shown as usual *)
-let gunzip ?(keep = false) fname =
- if not (Pcre.pmatch ~pat:"\\.gz$" fname) then
- failwith "gunzip: source file doesn't end with '.gz'";
- let basename = Pcre.replace ~pat:"\\.gz$" fname in
- if keep then (* keep original file *)
- Shell.call
- ~stdout:(Shell.to_file basename)
- [Shell.cmd "gunzip" ["-f"; "-c"; fname]]
- else (* don't keep original file *)
- Shell.call [Shell.cmd "gunzip" ["-f"; fname]]
-
-let tempfile () =
- let buf = Buffer.create 28 in (* strlen("/tmp/fileSzb3Mw_http_getter") *)
- Shell.call
- ~stdout:(Shell.to_buffer buf)
- [Shell.cmd "tempfile" ["--suffix=_http_getter"]];
- Pcre.replace ~pat:"\n" (Buffer.contents buf)
-
projects / helm.git / blobdiff