Changeset 89

Timestamp:

12/06/10 16:27:38 (13 years ago)

Author:

nanardon

Message:

• make search to work again

File:

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

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

@@ -27 +27 @@
 }
 
+sub results :Local {
+    my ( $self, $c ) = @_;
+
+    if ($c->req->param('page')) {
+        $c->req->params->{search} ||= $c->session->{search};
+    }
+
+    if ($c->req->param('search')) {
+        $c->session->{search} = $c->req->param('search');
+        $c->forward('quick', [
+                {
+                    page => $c->req->param('page'),
+                } , grep { $_ } split(/\s/, $c->req->param('search')) ]);
+    }
+}
+
 sub distrib_search : Private {
     my ( $self, $c, $searchspec ) = @_;
@@ -48 +64 @@
     );
 
-    if (!$searchspec->{page}) {
+    if (1 || !$searchspec->{page}) {
         my $pager = $rs->pager;
+        $c->stash->{pager} = $pager;
         $c->stash->{xmlrpc} = {
                 pages => $pager->last_page,
@@ -399 +416 @@
 
         },
-        {
-            %{$c->forward('search_param')},
-        },
     );
     $c->forward('format_search', $searchspec);