Changeset 43

Timestamp:

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

Author:

nanardon

Message:

• add search functions

Location:

server/trunk/web

Files:

• lib/Sophie/Base/Result/Files.pm (modified) (1 diff)
• lib/Sophie/Controller/0Explorer.pm (modified) (3 diffs)
• lib/Sophie/Controller/Explorer.pm (modified) (1 diff)
• lib/Sophie/Controller/Search.pm (modified) (8 diffs)
• root/templates/html/search (added)
• root/templates/html/search/index.html (added)
• root/templates/html/search/results.tt (added)
• root/templates/html/search/simple_search.tt (added)
• root/templates/includes/header.tt (modified) (2 diffs)

server/trunk/web/lib/Sophie/Base/Result/Files.pm

@@ -6 +6 @@
 
 __PACKAGE__->table('files');
-__PACKAGE__->add_columns(qw/pkgid count dirname basename md5/);
+__PACKAGE__->add_columns(qw/pkgid count dirname basename md5 user group linkto
+    mode fflags size class color vflags mtime nlink/);
 __PACKAGE__->set_primary_key(qw/pkgid count/);
 __PACKAGE__->belongs_to(Rpms => 'Sophie::Base::Result::Rpms', 'pkgid');

server/trunk/web/lib/Sophie/Controller/0Explorer.pm

@@ -27 +27 @@
     $c->stash->{path} = $dir;
     $c->stash->{explorerurl} = '/explorer' . ($dir ? "/$dir" : '');
+
+    my $rsdist = $c->forward('/search/distrib_search', [ $c->session->{__explorer} ]);
     $c->stash->{xmlrpc} = [ $c->model('Base')
       ->resultset('Files')
       ->search(
-          { dirname => '/' . ($dir ? "$dir/" : '') },
+          {
+              dirname => '/' . ($dir ? "$dir/" : ''),
+              pkgid => { IN => $rsdist->get_column('pkgid')->as_query, },
+          },
           {
               order_by => [ 'basename' ],
@@ -45 +50 @@
     $c->stash->{path} = $dir;
     $c->stash->{explorerurl} = '/explorer' . ($dir ? "/$dir" : '');
+
+    my $rsdist = $c->forward('/search/distrib_search', [ $c->session->{__explorer} ]);
+
     $c->stash->{xmlrpc} = [ 
         map { { pkgid => $_->get_column('pkgid') } }
@@ -50 +58 @@
       ->resultset('Files')
       ->search({
-              dirname => '/' . ($dir ? "$dir/" : ''), basename => $basename
+              dirname => '/' . ($dir ? "$dir/" : ''), basename => $basename,
+              pkgid => { IN => $rsdist->get_column('pkgid')->as_query, },
           },
           { 

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

@@ -24 +24 @@
 sub index :Path {
     my ( $self, $c, @args ) = @_;
+
+    if (grep { exists($c->req->params->{$_}) } qw(distribution release arch)) {
+        $c->session->{explorer} = {
+            distribution => $c->req->param('distribution') || undef,
+            release => $c->req->param('release') || undef,
+            arch => $c->req->param('arch') || undef,
+        };
+    }
+    $c->session->{__explorer} = $c->session->{explorer};
 
     $c->stash->{path} = join('/', grep { $_  } @args);

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",

server/trunk/web/root/templates/includes/header.tt

@@ -11 +11 @@
     <meta name="REVISIT-AFTER" content="[% IF metarevisite %][% metarevisite %][% ELSE %]15[% END %] days">
     <link rel="icon" href="[%- c.uri_for('/static', 'sophie.ico') -%]" type="image/x-icon">
-    <script type="text/javascript" language="JavaScript" src="[% c.uri_for('/static', 'CalendarPopup.js') %]"></script>
     <script type="text/javascript" language="JavaScript" src="[% c.uri_for('/static', 'prototype.js') %]"></script>
     <script type="text/javascript" language="JavaScript" src="[% c.uri_for('/static', 'effects.js') %]"></script>
@@ -24 +23 @@
         <p id="sitename">Sophie</p>
         <p id="sophie_menu">
+        <span><a href="[% c.uri_for('/search') %]">Search</a></span>
         <span><a href="[% c.uri_for('/distrib') %]">Distribution</a></span>
         <span><a href="[% c.uri_for('/explorer') %]">Explorer</a></span>