]> matita.cs.unibo.it Git - helm.git/commitdiff
projects / helm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 63410c3)
ported to latest ocaml-http API
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 20 May 2004 16:12:44 +0000 (16:12 +0000)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 20 May 2004 16:12:44 +0000 (16:12 +0000)
helm/graphs/tools/drawGraph.ml patch | blob | history
helm/graphs/tools/uriSetQueue.ml patch | blob | history
helm/http_getter/main.ml patch | blob | history
helm/proofChecker/proofChecker.ml patch | blob | history

diff --git a/helm/graphs/tools/drawGraph.ml b/helm/graphs/tools/drawGraph.ml
index 1a980fede0d3559e1b0625e28539e4093584ad04..9f86feeb074de7700501acc7196f168d5b7fc276 100644 (file)
--- a/helm/graphs/tools/drawGraph.ml
+++ b/helm/graphs/tools/drawGraph.ml
@@ -82,11 +82,11 @@ let callback (req: Http_types.request) outchan =
         ignore (Unix.system (
           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)
+        Http_daemon.respond_error ~code:(`Status (`Client_error `Bad_request))
+          outchan)
   with
   | Http_types.Param_not_found attr_name ->
-      Http_daemon.respond_error
-        ~status:(`Client_error `Bad_request)
+      Http_daemon.respond_error ~code:(`Status (`Client_error `Bad_request))
         ~body:(sprintf "Parameter '%s' is missing" attr_name)
         outchan
 in
diff --git a/helm/graphs/tools/uriSetQueue.ml b/helm/graphs/tools/uriSetQueue.ml
index 77d15dcad104d87bfecb45d2a6f138d9c71c0f47..43027580016fe58101457ccc8ae38398ff8f0e8c 100644 (file)
--- a/helm/graphs/tools/uriSetQueue.ml
+++ b/helm/graphs/tools/uriSetQueue.ml
@@ -164,19 +164,19 @@ let callback (req: Http_types.request) outchan =
 
     | invalid_request ->
         debug_print ("Invalid request received");
-        Http_daemon.respond_error ~status:(`Client_error `Bad_request) outchan);
+        Http_daemon.respond_error
+          ~code:(`Status (`Client_error `Bad_request)) outchan);
         prerr_endline "Request done!\n"
   with
   | Http_types.Param_not_found attr_name ->
-      Http_daemon.respond_error
-        ~status:(`Client_error `Bad_request)
+      Http_daemon.respond_error ~code:(`Status (`Client_error `Bad_request))
         ~body:(sprintf "Parameter '%s' is missing" attr_name)
         outchan
   | Failure "int_of_string" ->  (* error in converting some paramters *)
-      Http_daemon.respond_error ~status:(`Client_error `Bad_request) outchan
-  | Queue_not_found queue_name ->
       Http_daemon.respond_error
-        ~status:(`Client_error `Bad_request)
+        ~code:(`Status (`Client_error `Bad_request)) outchan
+  | Queue_not_found queue_name ->
+      Http_daemon.respond_error ~code:(`Status (`Client_error `Bad_request))
         ~body:(sprintf "Queue '%d' is not defined" queue_name)
         outchan
 in
diff --git a/helm/http_getter/main.ml b/helm/http_getter/main.ml
index 6501afdafb61799a08642c16df98667a1d4eae5c..8fa671ab9febd8ae04b44c687cca723f40505aee 100644 (file)
--- a/helm/http_getter/main.ml
+++ b/helm/http_getter/main.ml
@@ -123,10 +123,11 @@ let return_html_internal_error = mk_return_fun pp_internal_error "text/html"
 let return_html_msg = mk_return_fun pp_msg "text/html"
 let return_html_raw = mk_return_fun null_pp "text/html"
 let return_xml_raw = mk_return_fun null_pp "text/xml"
-let return_400 body outchan = Http_daemon.respond_error ~code:400 ~body outchan
+let return_400 body outchan =
+  Http_daemon.respond_error ~code:(`Code 400) ~body outchan
 
 let return_all_foo_uris doctype uris outchan =
-  Http_daemon.send_basic_headers ~code:200 outchan;
+  Http_daemon.send_basic_headers ~code:(`Code 200) outchan;
   Http_daemon.send_header "Content-Type" "text/xml" outchan;
   Http_daemon.send_headers common_headers outchan;
   Http_daemon.send_CRLF outchan;
@@ -233,7 +234,7 @@ let log_failure msg = Http_getter_logger.log ("Request not fulfilled: " ^ msg)
    * given output channel. Response is sent embedded in an HTML document.
    * Channel is closed afterwards. *)
 let send_log_to ?prepend action outchan =
-  Http_daemon.send_basic_headers ~code:200 outchan;
+  Http_daemon.send_basic_headers ~code:(`Code 200) outchan;
   Http_daemon.send_header "Content-Type" "text/html" outchan;
   Http_daemon.send_CRLF outchan;
   output_string outchan "<html><body>\n"; flush outchan;
@@ -306,7 +307,8 @@ let callback (req: Http_types.request) outchan =
     | "/getempty" ->
         Http_daemon.respond ~body:Http_getter_const.empty_xml outchan
     | invalid_request ->
-        Http_daemon.respond_error ~status:(`Client_error `Bad_request) outchan);
+        Http_daemon.respond_error ~code:(`Status (`Client_error `Bad_request))
+          outchan);
     Http_getter_logger.log "Done!\n"
   with
   | Http_types.Param_not_found attr_name ->
diff --git a/helm/proofChecker/proofChecker.ml b/helm/proofChecker/proofChecker.ml
index 6513d4f930085eb020258a8e01117575357c44df..278413bde8fc77e4ff1a3f8e95e4d0b58c1d3547 100644 (file)
--- a/helm/proofChecker/proofChecker.ml
+++ b/helm/proofChecker/proofChecker.ml
@@ -50,7 +50,8 @@ END
 let bad_request outchan =
   printf "INVALID REQUEST !!!!!\n\n";
   flush stdout;
-  Http_daemon.respond_error ~status:(`Client_error `Bad_request) outchan;
+  Http_daemon.respond_error ~code:(`Status (`Client_error `Bad_request))
+    outchan;
   flush outchan
 ;;
 
@@ -98,7 +99,7 @@ let callback (req : Http_types.request) outchan' =
         outchan := outchan' ;
         try
           let uri = req#param "uri" in
-          Http_daemon.send_basic_headers ~code:200 outchan' ;
+          Http_daemon.send_basic_headers ~code:(`Code 200) outchan' ;
           Http_daemon.send_header "Content-type" "text/html" outchan' ; 
           Http_daemon.send_CRLF outchan' ;
           printf "Request to proof-check \"%s\"..." uri;
Unnamed repository; edit this file 'description' to name the repository.