X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhttp_getter%2Fhttp_getter_misc.ml;h=1ec7101c876b274c06a935248df65a96300e86e0;hb=f4389bc575610ab6cabcc0a034ae5a3b92739f60;hp=036e05996819f9c4bb4610292c0ecd08265901d1;hpb=c3e872308eb13fac1217091154999ea53fb957bf;p=helm.git diff --git a/helm/http_getter/http_getter_misc.ml b/helm/http_getter/http_getter_misc.ml index 036e05996..1ec7101c8 100644 --- a/helm/http_getter/http_getter_misc.ml +++ b/helm/http_getter/http_getter_misc.ml @@ -1,5 +1,5 @@ (* - * Copyright (C) 2000, HELM Team. + * Copyright (C) 2003, HELM Team. * * This file is part of HELM, an Hypertextual, Electronic * Library of Mathematics, developed at the Computer Science @@ -46,14 +46,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 +122,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