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
(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)
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
;;
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