Changeset 11992 for lang/perl/WebService-Simple/trunk/lib/WebService/Simple.pm

Timestamp:

05/19/08 21:59:09 (6 months ago)

Author:

daisuke

Message:

attempt to fix get()

Files:

• lang/perl/WebService-Simple/trunk/lib/WebService/Simple.pm (modified) (2 diffs)

lang/perl/WebService-Simple/trunk/lib/WebService/Simple.pm

@@ -115 +115 @@
 
 sub request_url {
+    my ($self, $url, %extra) = @_;
+    my $uri = URI->new($self->base_url);
+
+    if($url){
+        $url =~ s!^/!!;
+        $uri->path( $uri->path . $url);
+    }
+
+    map { utf8::encode($extra{$_}) if utf8::is_utf8($extra{$_}) } keys %extra;
+    $uri->query_form( %{$self->basic_params}, %extra );
+
+    return $uri;
+}
+
+sub get
+{
     my $self = shift;
     my ($url, %extra);
 
     if (ref $_[0] eq 'HASH') {
-        $url = "";
+        $url = "";
         %extra = %{shift @_};
     } else {
@@ -128 +144 @@
     }
 
-    my $uri = URI->new($self->base_url);
-
-    if($url){
-        $url =~ s!^/!!;
-        $uri->path( $uri->path . $url);
-    }
-
-    map { utf8::encode($extra{$_}) if utf8::is_utf8($extra{$_}) } keys %extra;
-    $uri->query_form( %{$self->basic_params}, %extra );
-
-    return $uri;
-}
-
-sub get
-{
-    my ($self, $url, %extra) = @_;
-    my $uri = $self->request_url($url,%extra);
+    my $uri = $self->request_url($url, %extra);
 
     my @headers = @_;