- use ocaml-http instead of netclient for http GET requests

[helm.git] / helm / graphs / tools / drawGraph.ml

diff --git a/helm/graphs/tools/drawGraph.ml b/helm/graphs/tools/drawGraph.ml
index b7abfe901a25a0e6ebb530d90d3439375ea1b962..0714383190fbc4f75b4db18abf063ee1f25eaf59 100644 (file)
--- a/helm/graphs/tools/drawGraph.ml
+++ b/helm/graphs/tools/drawGraph.ml
@@ -36,9 +36,8 @@ let dir_env_var = "DRAW_GRAPH_DIR";;
 
 let wget url fname =
   prerr_endline (sprintf "DEBUG: wgetting url '%s'" url);
-  let data = Http_client.Convenience.http_get url in
   let oc = open_out fname in
-  output_string oc data;
+  Http_client.http_get_iter (output_string oc) url;
   close_out oc
 ;;
 
@@ -76,7 +75,7 @@ let callback (req: Http_types.request) outchan =
         let url = req#param "url" in
         let pid = Unix.getpid () in
         wget (sprintf "%s&param.PID=%d" url pid) (sprintf "prova0.%d.dot" pid);
-        (match Unix.system (sprintf "make PID=%d > log.%d" pid pid) with
+        (match Unix.system (sprintf "make tmp PID=%d > log.%d" pid pid) with
         | Unix.WEXITED 0 ->
             debug_print "HTML successfully generated";
             Http_daemon.respond_file (sprintf "prova.%d.html" pid) outchan
@@ -93,7 +92,7 @@ let callback (req: Http_types.request) outchan =
         let pid = req#param "pid" in
         Http_daemon.respond_file (sprintf "prova.%s.gif" pid) outchan;
         ignore (Unix.system (
-          sprintf "make PID=%s clean; rm -f prova0.%s.dot" pid pid))
+          sprintf "make PID=%s clean_tmp; rm -f prova0.%s.dot" pid pid))
     | invalid_request ->
         Http_daemon.respond_error ~status:(`Client_error `Bad_request) outchan)
   with