X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fhttp_getter_misc.ml;h=d1c221f35b1e52e75b27aa13b0f9b2ddda3b6fb8;hb=5d7d6bd5090f3f82279bef0b93b4b361a5b1d751;hp=ab517e20ed66fdf57a188591b69e984d2ced1b10;hpb=32bc9336091a84376f93b06325c08dab58124a0d;p=helm.git

diff --git a/helm/http_getter/http_getter_misc.ml b/helm/http_getter/http_getter_misc.ml
index ab517e20e..d1c221f35 100644
--- a/helm/http_getter/http_getter_misc.ml
+++ b/helm/http_getter/http_getter_misc.ml
@@ -1,5 +1,7 @@
 (*
- *  Copyright (C) 2003, 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_debugger;;
@@ -46,14 +48,34 @@ let hashtbl_sorted_fold f tbl init =
   in
   List.fold_left (fun acc k -> f k (Hashtbl.find tbl k) acc) init sorted_keys
 
-let wget ?output url =
-  let flags =
-    (match output with Some file -> ["-O"; file] | None -> []) @ [url]
-  in
-  debug_print ("wget " ^ String.concat " " flags);
+let cp src dst =
   Shell.call
     ~stdout:Shell.to_dev_null ~stderr:Shell.to_dev_null
-    [Shell.cmd "wget" flags]
+    [Shell.cmd "cp" [src; dst]]
+
+let file_scheme_RE = Pcre.regexp "^file://"
+let wget ?output url =
+  let use_wget () =
+    let flags =
+      (match output with Some file -> ["-O"; file] | None -> []) @ [url]
+    in
+    debug_print ("wget " ^ String.concat " " flags);
+    Shell.call
+      ~stdout:Shell.to_dev_null ~stderr:Shell.to_dev_null
+      [Shell.cmd "wget" flags]
+  in
+  if Pcre.pmatch ~rex:file_scheme_RE url then begin (* file:// URL *)
+    let src_fname = Pcre.replace ~rex:file_scheme_RE url in
+    match output with
+    | Some dst_fname -> cp src_fname dst_fname
+    | None ->
+        let dst_fname = Filename.basename src_fname in
+        if src_fname <> dst_fname then
+          cp src_fname dst_fname
+        else  (* src and dst are the same: do nothing *)
+          ()
+  end else  (* other URL, pass it to wget *)
+    use_wget ()
 
   (* stderr shown as usual *)
 let gzip ?(keep = false) fname =
@@ -102,7 +124,19 @@ let string_of_proc_status = function
   | Unix.WSTOPPED sg -> sprintf "[Stopped: %d]" sg
 
 let http_get url =
-  try
-    Some (Http_client.Convenience.http_get url)
-  with Http_client.Http_error (code, _) -> None
+  if Pcre.pmatch ~rex:file_scheme_RE url then begin
+      (* file:// URL. Read data from file system *)
+    let fname = Pcre.replace ~rex:file_scheme_RE url in
+    try
+      let size = (Unix.stat fname).Unix.st_size in
+      let buf = String.create size in
+      let ic = open_in fname in
+      really_input ic buf 0 size;
+      close_in ic;
+      Some buf
+    with Unix.Unix_error (Unix.ENOENT, "stat", _) -> None
+  end else  (* other URL, pass it to netclient *)
+    try
+      Some (Http_client.Convenience.http_get url)
+    with Http_client.Http_error (code, _) -> None