- fixed helm web page url and copyright notice

[helm.git] / helm / http_getter / http_getter_common.ml

diff --git a/helm/http_getter/http_getter_common.ml b/helm/http_getter/http_getter_common.ml
index c076c2e70d24d94bb691797f7107decdcf8186c8..0e66b2035d2fcd0120307cdb5d88c2a71b3b741c 100644 (file)
--- a/helm/http_getter/http_getter_common.ml
+++ b/helm/http_getter/http_getter_common.ml
@@ -1,5 +1,7 @@
 (*
- *  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
@@ -21,7 +23,7 @@
  *  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;;
@@ -97,9 +99,9 @@ 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 ~code:200 outchan;
@@ -110,42 +112,3 @@ let return_file ~fname ?contype ?contenc ?(patch_fun = fun x -> x) outchan =
     fname
 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)
-