X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fgetter%2Fhttp_getter_misc.ml;h=b25a425805ad9c6a29cda92c83cd87aff2af496d;hb=6912a028bef118d8e9d7c2847200510a9b055c6a;hp=941efe25c497a8f7c72f52537bf9bc809d6c410c;hpb=741b3e9014f940fbbd34bee7b606ff7e72170452;p=helm.git

diff --git a/helm/ocaml/getter/http_getter_misc.ml b/helm/ocaml/getter/http_getter_misc.ml
index 941efe25c..b25a42580 100644
--- a/helm/ocaml/getter/http_getter_misc.ml
+++ b/helm/ocaml/getter/http_getter_misc.ml
@@ -28,13 +28,22 @@
 
 open Printf
 
+let file_scheme_prefix = "file://"
+
 let trailing_dot_gz_RE = Pcre.regexp "\\.gz$"   (* for g{,un}zip *)
 let url_RE = Pcre.regexp "^([\\w.-]+)(:(\\d+))?(/.*)?$"
 let http_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^http://"
-let file_scheme_RE = Pcre.regexp ~flags:[`CASELESS] "^file://"
+let file_scheme_RE = Pcre.regexp ~flags:[`CASELESS] ("^" ^ file_scheme_prefix)
 let dir_sep_RE = Pcre.regexp "/"
 let heading_slash_RE = Pcre.regexp "^/"
 
+let local_url =
+  let rex = Pcre.regexp ("^(" ^ file_scheme_prefix ^ ")(.*)(.gz)$") in
+  fun s ->
+    try
+      Some ((Pcre.extract ~rex s).(2))
+    with Not_found -> None
+
 let bufsiz = 16384  (* for file system I/O *)
 let tcp_bufsiz = 4096 (* for TCP I/O *)
 
@@ -62,18 +71,37 @@ let hashtbl_sorted_iter f tbl =
   let sorted_keys =
     List.sort compare (Hashtbl.fold (fun key _ keys -> key::keys) tbl [])
   in
-  List.iter (fun k -> f k (Hashtbl.find tbl k)) sorted_keys
+    List.iter (fun k -> f k (Hashtbl.find tbl k)) sorted_keys
 
 let cp src dst =
-  let (ic, oc) = (open_in src, open_out dst) in
-  let buf = String.create bufsiz in
-  (try
-    while true do
-      let bytes = input ic buf 0 bufsiz in
-      if bytes = 0 then raise End_of_file else output oc buf 0 bytes
-    done
-  with End_of_file -> ());
-  close_in ic; close_out oc
+  try 
+    let ic = open_in src in
+      try
+	let oc = open_out dst in
+	let buf = String.create bufsiz in
+	  (try
+	     while true do
+	       let bytes = input ic buf 0 bufsiz in
+		 if bytes = 0 then raise End_of_file else output oc buf 0 bytes
+	     done
+	   with 
+	       End_of_file -> ()
+	  );
+	  close_in ic; close_out oc
+      with 
+	  Sys_error s -> 
+	    Http_getter_logger.log s;
+	    close_in ic
+	| e -> 
+	    Http_getter_logger.log (Printexc.to_string e);
+	    close_in ic;
+	    raise e
+  with 
+      Sys_error s -> 
+	Http_getter_logger.log s
+    | e -> 
+	Http_getter_logger.log (Printexc.to_string e);
+	raise e
 
 let wget ?output url =
   Http_getter_logger.log
@@ -94,7 +122,7 @@ let wget ?output url =
       (let oc = 
         open_out (match output with Some f -> f | None -> Filename.basename url)
       in
-      Http_client.http_get_iter (fun data -> output_string oc data) url;
+      Http_user_agent.get_iter (fun data -> output_string oc data) url;
       close_out oc)
   | scheme -> (* unsupported scheme *)
       failwith ("Http_getter_misc.wget: unsupported scheme: " ^ scheme)
@@ -135,7 +163,6 @@ let gunzip ?(keep = false) ?output fname =
   begin
     try
       let ic = Gzip.open_in_chan zic in
-      Http_getter_logger.log (sprintf "LUCA: OK" );
       let oc = open_out output in
       let buf = String.create bufsiz in
       (try
@@ -144,11 +171,11 @@ let gunzip ?(keep = false) ?output fname =
           if bytes = 0 then raise End_of_file else Pervasives.output oc buf 0 bytes
         done
       with End_of_file -> ());
-      close_out oc
+	close_out oc;
+	Gzip.close_in ic
     with
       e -> close_in zic ; raise e
   end ;
-  close_in zic ;
   if not keep then Sys.remove fname
 ;;
 
@@ -204,12 +231,12 @@ let http_get url =
       close_in ic;
       Some buf
     with Unix.Unix_error (Unix.ENOENT, "stat", _) -> None
-  end else  (* other URL, pass it to Http_client *)
+  end else  (* other URL, pass it to Http_user_agent *)
     try
-      Some (Http_client.http_get url)
+      Some (Http_user_agent.get url)
     with e ->
       Http_getter_logger.log (sprintf
-        "Warning: Http_client failed on url %s with exception: %s"
+        "Warning: Http_user_agent failed on url %s with exception: %s"
         url (Printexc.to_string e));
       None