Changeset 43 for server/trunk/web/lib/Sophie/Controller/Search.pm

Timestamp:

11/28/10 19:30:07 (14 years ago)

Author:

nanardon

Message:

• add search functions

File:

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

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

@@ -23 +23 @@
 =cut
 
-my $search_param = {
-    rows => Sophie->config()->{'max_reply'} || 20000,
-    order_by => [ 'name', 'evr using >>', 'issrc' ],
-    select => [ 'pkgid' ],
-};
-
 sub index :Path :Args(0) {
     my ( $self, $c ) = @_;
 
-    $c->response->body('Matched Sophie::Controller::Search in Search.');
+    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('fuzzy', [ undef, $c->req->param('search') ]);
+        my $pager = $c->stash->{rs}->pager;
+        $c->stash->{pager} = $pager;
+        $c->stash->{xmlrpc} = [
+            $c->stash->{rs}->get_column('pkgid')->all
+        ];
+    }
+}
+
+sub search_param : Private {
+    my ($self, $c) = @_;
+    my $r = {
+        rows => Sophie->config()->{'max_reply'} || 20000,
+        order_by => [ 'name', 'evr using >>', 'issrc' ],
+        select => [ 'pkgid' ],
+    };
+    if (!$c->req->xmlrpc->method) {
+        $r->{page} = $c->req->param('page') || 1;
+        $r->{rows} = 25;
+    }
+    return $r;
 }
 
@@ -48 +68 @@
             {
                 $searchspec->{release}
-                    ? (release => $searchspec->{release})
+                    ? (version => $searchspec->{release})
                     : ()
             }
@@ -84 +104 @@
             ]     
         },
-        $search_param,
+        $c->forward('search_param'),
     )->get_column('pkgid')->all ]
 
@@ -120 +140 @@
             ]     
         },
-        $search_param,
+        $c->forward('search_param'),
     )->get_column('pkgid')->all ]
 }
@@ -151 +171 @@
             ]     
         },
-        $search_param,
+        $c->forward('search_param'),
     )->get_column('pkgid')->all ]
 }
@@ -165 +185 @@
     )->get_column('pkgid');
 
-    $c->stash->{xmlrpc} = [ $c->model('Base')->resultset('Rpms')->search(
+    $c->stash->{rs} = 
+
+        $c->model('Base')->resultset('Rpms')->search(
         {
             -and => [
@@ -185 +207 @@
             ]     
         },
-        $search_param,
-    )->get_column('pkgid')->all ]
+        $c->forward('search_param'),
+    );
+    
+    if ($c->req->xmlrpc->method) {
+        $c->stash->{xmlrpc} = [ 
+            $c->stash->{rs}->get_column('pkgid')->all
+        ];
+    }
 }
 
@@ -208 +236 @@
         },
         {
-            %$search_param,
+            %{$c->forward('search_param')},
             select => [ 
                 "ts_rank_cd(to_tsvector('english', description),to_tsquery(?)) as rank",