- merged "post" branch

[helm.git] / helm / DEVEL / ocaml-http / examples / dump_args.ml

diff --git a/helm/DEVEL/ocaml-http/examples/dump_args.ml b/helm/DEVEL/ocaml-http/examples/dump_args.ml
index ef4630fdec715cf86fcbe304a40f4dc49af8cce1..3287ea710e06e83c6bfcea5783b5432d17b86907 100644 (file)
--- a/helm/DEVEL/ocaml-http/examples/dump_args.ml
+++ b/helm/DEVEL/ocaml-http/examples/dump_args.ml
@@ -21,31 +21,25 @@
 
 open Printf;;
 
-let dump_args path args =
-  Printf.sprintf
-    "PATH: %s\nARGS:\n%s"
-    path
-    (String.concat
-      ""
-      (List.map
-        (fun (name, value) -> sprintf "\tNAME: '%s', VALUE: '%s'\n" name value)
-        args))
-in
-let callback path args outchan =
-  match path with
-  | "/gone" ->
-      Http_daemon.respond_redirect
-        ~location:"/foo" ~body:"REDIRECT" ~code:302 outchan
-  | "/error" ->
-      Http_daemon.respond_error ~body:"ERROR" ~code:500 outchan
-  | _ ->
-      begin
-        Http_daemon.send_basic_headers ~code:200 outchan;
-        Http_daemon.send_CRLF outchan;
-        output_string outchan (dump_args path args)
-      end
+let callback req outchan =
+  Http_daemon.send_basic_headers ~code:200 outchan;
+  Http_daemon.send_CRLF outchan;
+  let (s1, s2, s3, s4) = 
+    (sprintf "request path = %s\n"  req#path),
+    (sprintf "request GET params = %s\n"
+      (String.concat ";"
+        (List.map (fun (h,v) -> String.concat "=" [h;v]) req#params_GET))),
+    (sprintf "request POST params = %s\n"
+      (String.concat ";"
+        (List.map (fun (h,v) -> String.concat "=" [h;v]) req#params_POST))),
+    (sprintf "request ALL params = %s\n"
+      (String.concat ";"
+        (List.map (fun (h,v) -> String.concat "=" [h;v]) req#params)))
+  in
+  output_string outchan (s1 ^ s2 ^ s3 ^ s4);
+  prerr_endline (s1 ^ s2 ^ s3 ^ s4)
 in
 print_endline "Starting custom Http_daemon ...";
 flush stdout;
-Http_daemon.start ~port:9999 callback
+Http_daemon.start' ~port:9999 callback