Updated deps

[perl4caml.git] / wrappers / pl_WWW_Mechanize.ml

diff --git a/wrappers/pl_WWW_Mechanize.ml b/wrappers/pl_WWW_Mechanize.ml
index 2582b9d..f9e4604 100644 (file)
--- a/wrappers/pl_WWW_Mechanize.ml
+++ b/wrappers/pl_WWW_Mechanize.ml
@@ -2,7 +2,7 @@
   *
   * Copyright (C) 2004 Merjis Ltd.
   *
-  * $Id: pl_WWW_Mechanize.ml,v 1.2 2004-11-26 13:33:10 rich Exp $
+  * $Id: pl_WWW_Mechanize.ml,v 1.6 2005-08-16 15:39:22 rich Exp $
   *)
 
 open Perl
@@ -129,7 +129,33 @@ object (self)
   method submit () =
     call_method_void sv "submit" []
 
-  (*method submit_form ?form_number ?form_name ?fields ?button ?xy () *)
+  method submit_form ?form_number ?form_name ?fields ?button ?xy () =
+    let args = ref [] in
+    let add name f = function
+      | None -> ()
+      | Some p -> args := sv_of_string name :: f p :: !args
+    in
+    add "form_number" sv_of_int form_number;
+    add "form_name" sv_of_string form_name;
+    (match fields with
+     | None -> ()
+     | Some fields ->
+        let hv = hv_empty () in
+        List.iter (
+          fun (name, value) ->
+            hv_set hv name (sv_of_string value)
+        ) fields;
+        let sv = hashref hv in
+        args := sv_of_string "fields" :: sv :: !args
+    );
+    add "button" sv_of_string button;
+    (match xy with
+     | None -> ()
+     | Some (x, y) ->
+        args := sv_of_string "x" :: sv_of_int x ::
+          sv_of_string "y" :: sv_of_int y :: !args);
+    let sv = call_method sv "submit_form" !args in
+    new Pl_HTTP_Response.http_response sv
 
   method success =
     let sv = call_method sv "success" [] in
@@ -156,7 +182,9 @@ object (self)
     let sv = call_method sv "content" [] in
     string_of_sv sv
   (* method current_forms = *)
-  (* method links = *)
+  method links =
+    let svs = call_method_array sv "links" [] in
+    List.map (new www_mechanize_link) svs
   method is_html =
     let sv = call_method sv "is_html" [] in
     bool_of_sv sv
@@ -185,8 +213,40 @@ object (self)
 
 end
 
+and www_mechanize_link sv =
+
+object (self)
+
+  method sv = sv
+
+  method url =
+    let sv = call_method sv "url" [] in
+    string_of_sv sv
+
+  method text =
+    let sv = call_method sv "text" [] in
+    string_of_sv sv
+
+  method name =
+    let sv = call_method sv "name" [] in
+    string_of_sv sv
+
+  method tag =
+    let sv = call_method sv "tag" [] in
+    string_of_sv sv
+
+  method base =
+    let sv = call_method sv "base" [] in
+    string_of_sv sv
+
+end
+
 (* XXX Should be able to pass args to constructor of LWP::UserAgent. *)
 (* XXX WWW::Mechanize has additional parameters. *)
-let new_ () =
-  let sv = call_class_method "WWW::Mechanize" "new" [] in
+let new_ ?autocheck () =
+  let args = ref [] in
+  let may f = function None -> () | Some v -> f v in
+  may (fun v ->
+        args := sv_of_string "autocheck" :: sv_of_bool v :: !args) autocheck;
+  let sv = call_class_method "WWW::Mechanize" "new" !args in
   new www_mechanize sv