Changeset 24452

Timestamp:

11/20/08 17:03:49 (7 weeks ago)

Author:

kazuho

Message:

defer loading of CGI::Simple in plugin::mobile

Location:

lang/perl/NanoA/trunk

Files:

• lib/NanoA.pm (modified) (1 diff)
• plugin/mobile.pm (modified) (1 diff)

lang/perl/NanoA/trunk/lib/NanoA.pm

@@ -58 +58 @@
     return $self->{query} = shift
         if @_;
+    if ($self->{query} && ref $self->{query} eq 'CODE') {
+        $self->{query} = $self->{query}->($self);
+    }
     unless ($self->{query}) {
         require_once('CGI/Simple.pm');

lang/perl/NanoA/trunk/plugin/mobile.pm

@@ -31 +31 @@
     # build query object by myself and register it, since in first prerun,
     # there is no query object yet
-    do {
-        NanoA::require_once('CGI/Simple.pm');
-        local $CGI::Simple::PARAM_UTF8 = undef;
-        my $q = CGI::Simple->new();
-        # error occurs when trying to replace contents using Vars
-        for my $n ($q->param) {
-            my @v = $q->param($n);
-            if (@v >= 2) {
-                $_ = decode($charset, $_)
-                    for @v;
-                $q->param($n, \@v);
-            } else {
-                $q->param($n, decode($charset, $v[0]));
+    $app->query(
+        sub {
+            NanoA::require_once('CGI/Simple.pm');
+            local $CGI::Simple::PARAM_UTF8 = undef;
+            my $q = CGI::Simple->new();
+            # error occurs when trying to replace contents using Vars
+            for my $n ($q->param) {
+                my @v = $q->param($n);
+                if (@v >= 2) {
+                    $_ = decode($charset, $_)
+                        for @v;
+                    $q->param($n, \@v);
+                } else {
+                    $q->param($n, decode($charset, $v[0]));
+                }
             }
-        }
-        $app->query($q);
-    };
+            $q;
+        },
+    );
 }