Changeset 90

Timestamp:

12/06/10 17:42:24 (13 years ago)

Author:

nanardon

Message:

• optimize search again

File:

• server/trunk/web/lib/Sophie/Controller/Search.pm (modified) (3 diffs)

server/trunk/web/lib/Sophie/Controller/Search.pm

@@ -38 +38 @@
         $c->forward('quick', [
                 {
-                    page => $c->req->param('page'),
+                    page => $c->req->param('page') || undef,
                 } , grep { $_ } split(/\s/, $c->req->param('search')) ]);
+
     }
 }
@@ -64 +65 @@
     );
 
-    if (1 || !$searchspec->{page}) {
-        my $pager = $rs->pager;
+    $c->stash->{rs} = $rs;
+    $c->stash->{column} ||= 'pkgid';
+    my @results;
+    if (ref $c->stash->{column}) {
+        while (my $i = $rs->next) {
+            push(@results, {
+                map { $_ => $i->get_column($_) } @{$c->stash->{column}} 
+            });
+        }
+    } else {
+        @results = $rs->get_column($c->stash->{column})->all;
+    }
+    if (!$searchspec->{page}) {
+        my $pager = $c->stash->{rs}->pager;
         $c->stash->{pager} = $pager;
         $c->stash->{xmlrpc} = {
@@ -74 +87 @@
         };
     }
-    $c->stash->{column} ||= 'pkgid';
-    if (ref $c->stash->{column}) {
-        my @results;
-        while (my $i = $rs->next) {
-            push(@results, {
-                map { $_ => $i->get_column($_) } @{$c->stash->{column}} 
-            });
-        }
-        $c->stash->{xmlrpc}{results} = \@results;
-    } else {
-        $c->stash->{xmlrpc}{results} = [
-            $rs->get_column($c->stash->{column})->all
-        ];
-    }
+    $c->stash->{xmlrpc}{results} = \@results;
     return $c->stash->{xmlrpc};
 }