* http://cs.unibo.it/helm/.
*)
-exception HttpClientError of exn * string;;
+exception HttpClientError of string * string;; (* reason, uri *)
let send cmd =
try
- ignore (Http_client.Convenience.http_get cmd)
+ ignore (Http_user_agent.get cmd)
with
- e -> raise (HttpClientError (e,cmd))
+ e -> raise (HttpClientError (Printexc.to_string e, cmd))
;;
let get uri =
try
- Http_client.Convenience.http_get uri
+ Http_user_agent.get uri
with
- e -> raise (HttpClientError (e,uri))
+ e -> raise (HttpClientError (Printexc.to_string e, uri))
;;
let get_and_save uri dest_filename =
- let reply = get uri
- and out_channel = open_out dest_filename in
- output_string out_channel reply ;
- close_out out_channel
+ let out_channel = open_out dest_filename in
+ Http_user_agent.get_iter (output_string out_channel) uri;
+ close_out out_channel
;;
let get_and_save_to_tmp uri =
done ;
cs
in
- let user = try Sys.getenv "USER" ^ "_" with Not_found -> "" in
- (* FG: Unix.getlogin () should be used instead of the above *)
- let tmp_file = Configuration.tmp_dir ^ "/" ^ user ^ (flat_string uri ".-=:;!?/&" '_') in
+ let user = try Unix.getlogin () with _ -> "" in
+ let tmp_file =
+ Filename.temp_file (user ^ flat_string uri ".-=:;!?/&" '_') ""
+ in
get_and_save uri tmp_file ;
tmp_file
;;
+