Changeset 40

Timestamp:

11/27/10 17:38:12 (13 years ago)

Author:

nanardon

Message:

• search function take into account search spec
• add fts over description

Location:

server/trunk/web

Files:

• lib/Sophie/Base/Result/Rpms.pm (modified) (1 diff)
• lib/Sophie/Controller/Explorer.pm (modified) (1 diff)
• lib/Sophie/Controller/Rpms.pm (modified) (1 diff)
• lib/Sophie/Controller/Search.pm (modified) (5 diffs)
• root/templates/html/0explorer/file.tt (modified) (1 diff)
• root/templates/html/explorer/index.html (modified) (1 diff)
• root/templates/includes/header.tt (modified) (1 diff)
• sophie.conf.in (modified) (1 diff)

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

@@ -6 +6 @@
 
 __PACKAGE__->table('rpms');
-__PACKAGE__->add_columns(qw/pkgid summary description issrc/);
+__PACKAGE__->add_columns(qw/pkgid summary description issrc name/);
 __PACKAGE__->set_primary_key(qw/pkgid/);
 __PACKAGE__->has_many(Rpmfile => 'Sophie::Base::Result::RpmFile', 'pkgid');

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

@@ -26 +26 @@
 
     $c->stash->{path} = join('/', grep { $_  } @args);
+    for(my $i=0; $i < @args; $i++) {
+        push(@{$c->stash->{eachpath}}, { dir=>$args[$i], path =>join('/',
+                    @args[0 .. $i] ) });
+    }
     $c->stash->{dirurl} = $c->uri_for('/0explorer/dir',
         $c->stash->{path} ?

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

@@ -179 +179 @@
 
 
-sub rpms : Chained : PathPart {
+sub rpms : Chained : PathPart :XMLRPCLocal {
     my ( $self, $c, $pkgid ) = @_;
     $c->stash->{pkgid} = $c->model('Base')->resultset('Rpms')->search(pkgid => $pkgid)->next;

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

@@ -2 +2 @@
 use Moose;
 use namespace::autoclean;
+use Sophie;
 
 BEGIN {extends 'Catalyst::Controller'; }
@@ -21 +22 @@
 
 =cut
+
+my $search_param = {
+    rows => Sophie->config()->{'max_reply'} || 20000,
+    order_by => [ 'name', 'evr using >>', 'issrc' ],
+    select => [ 'pkgid' ],
+};
 
 sub index :Path :Args(0) {
@@ -28 +35 @@
 }
 
+sub distrib_search : Private {
+    my ( $self, $c, $searchspec ) = @_;
+
+    return $c->model('Base')->resultset('Distribution')
+        ->search(
+            {
+                $searchspec->{distribution}
+                    ? (name => $searchspec->{distribution})
+                    : ()
+            }
+        )->search_related('Release',
+            {
+                $searchspec->{release}
+                    ? (release => $searchspec->{release})
+                    : ()
+            }
+        )->search_related('Arch',
+            {
+                $searchspec->{arch}
+                    ? (arch => $searchspec->{arch})
+                    : ()
+            }
+        )->search_related('Medias')
+        ->search_related('MediasPaths')
+        ->search_related('Paths')
+        ->search_related('Rpmfiles');
+}
+
 sub bytag : XMLRPCPath('/search/rpm/bytag') {
     my ( $self, $c, $searchspec, $tag, $tagvalue ) = @_;
 
-    @{$c->stash->{xmlrpc}} = $c->model('Base')->resultset('Rpms')->search(
-        {
-            pkgid => { IN => $c->model('Base')->resultset('Tags')
-                ->search({ tagname => $tag, value => $tagvalue})
-                ->get_column('pkgid')->as_query }
-        }
-    )->get_column('pkgid')->all
+    my $tagrs = $c->model('Base')->resultset('Tags')
+        ->search({ tagname => lc($tag), value => $tagvalue})
+        ->get_column('pkgid');
+    $c->stash->{xmlrpc} = [ $c->model('Base')->resultset('Rpms')->search(
+        {
+            -and => [ 
+                (exists($searchspec->{src})
+                    ? { issrc => $searchspec->{src} ? 1 : 0 }
+                    : ()),
+                { pkgid => 
+                    { IN => $tagrs->as_query, },
+                },
+                { pkgid =>
+                    { IN => $c->forward('distrib_search', [ $searchspec
+                        ])->get_column('pkgid')->as_query, }, 
+                },
+            ]     
+        },
+        $search_param,
+    )->get_column('pkgid')->all ]
 
 }
@@ -44 +92 @@
     my ( $self, $c, $searchspec, $deptype, $depname, $depsense, $depevr ) = @_;
 
-    @{$c->stash->{xmlrpc}} = $c->model('Base')->resultset('Rpms')->search(
-        {
-            pkgid => { IN => $c->model('Base')->resultset('Deps')
-                ->search({
-                        deptype => $deptype,
-                        depname => $depname,
-                        ($depsense
-                            ? (-nest => \[
-                                'rpmdepmatch(flags, evr, rpmsenseflag(?), ?)',
-                                     [ plain_text => $depsense],
-                                     [ plain_text => $depevr ]
-                                 ])
-                            : ()
-                        ),
-                })
-                ->get_column('pkgid')->as_query }
+    my $deprs = $c->model('Base')->resultset('Deps')->search(
+        {
+            deptype => $deptype,
+            depname => $depname,
+            ($depsense
+                ? (-nest => \[
+                    'rpmdepmatch(flags, evr, rpmsenseflag(?), ?)',
+                    [ plain_text => $depsense],
+                    [ plain_text => $depevr ]
+                ])
+            : ()),
         }
-    )->get_column('pkgid')->all
-
+    )->get_column('pkgid');
+    $c->stash->{xmlrpc} = [ $c->model('Base')->resultset('Rpms')->search(
+        {
+            -and => [ 
+                (exists($searchspec->{src})
+                    ? { issrc => $searchspec->{src} ? 1 : 0 }
+                    : ()),
+                { pkgid => 
+                    { IN => $deprs->as_query, },
+                },
+                { pkgid =>
+                    { IN => $c->forward('distrib_search', [ $searchspec
+                        ])->get_column('pkgid')->as_query, }, 
+                },
+            ]     
+        },
+        $search_param,
+    )->get_column('pkgid')->all ]
 }
 
@@ -69 +128 @@
     my ($dirname, $basename) = $file =~ m:^(.*/)?([^/]+)$:;
 
-    @{$c->stash->{xmlrpc}} = $c->model('Base')->resultset('Rpms')->search(
-        {
-            pkgid => { IN => $c->model('Base')->resultset('Files')
-                ->search({
-                        ($dirname
-                            ? (dirname => $dirname)
-                            : ()),
-                        basename => $basename,
-                })
-                ->get_column('pkgid')->as_query }
-        }
-    )->get_column('pkgid')->all
+    my $filers = $c->model('Base')->resultset('Files')
+    ->search({
+            ($dirname
+                ? (dirname => $dirname)
+                : ()),
+            basename => $basename,
+        })
+    ->get_column('pkgid');
+    $c->stash->{xmlrpc} = [ $c->model('Base')->resultset('Rpms')->search(
+        {
+            -and => [ 
+                (exists($searchspec->{src})
+                    ? { issrc => $searchspec->{src} ? 1 : 0 }
+                    : ()),
+                { pkgid => 
+                    { IN => $filers->as_query, },
+                },
+                { pkgid =>
+                    { IN => $c->forward('distrib_search', [ $searchspec
+                        ])->get_column('pkgid')->as_query, }, 
+                },
+            ]     
+        },
+        $search_param,
+    )->get_column('pkgid')->all ]
+}
+
+sub fuzzy : XMLRPCPath('/search/rpm/fuzzy') {
+    my ($self, $c, $searchspec, $name) = @_;
+
+    my $namers = $c->model('Base')->resultset('Tags')->search(
+        { tagname => 'name', value => { '~*' => $name } }
+    )->get_column('pkgid');
+    my $deprs = $c->model('Base')->resultset('Deps')->search(
+        { deptype => 'P', depname => { '~*' => $name } }
+    )->get_column('pkgid');
+
+    $c->stash->{xmlrpc} = [ $c->model('Base')->resultset('Rpms')->search(
+        {
+            -and => [
+                (exists($searchspec->{src})
+                    ? { issrc => $searchspec->{src} ? 1 : 0 }
+                    : ()),
+                { -or => [
+                    { pkgid => 
+                        { IN => $namers->as_query, },
+                    },
+                    { pkgid =>
+                        { IN => $deprs->as_query, },
+                    }, ]
+                },
+                { pkgid =>
+                    { IN => $c->forward('distrib_search', [ $searchspec
+                        ])->get_column('pkgid')->as_query, }, 
+                },
+            ]     
+        },
+        $search_param,
+    )->get_column('pkgid')->all ]
+}
+
+sub description : XMLRPCPath('/search/rpm/description') {
+    my ($self, $c, $searchspec, @keywords) = @_;
+    my $tsquery = join(' & ', map { $_ =~ s/ /\\ /g; $_ } @keywords);
+    $c->stash->{xmlrpc} = [ map { $_->get_column('pkgid') } $c->model('Base')->resultset('Rpms')->search(
+        {
+            -nest => \[
+                    "to_tsvector('english', description) @@ to_tsquery(?)",
+                    [ plain_text => $tsquery],
+                ],
+                (exists($searchspec->{src})
+                    ? (issrc => $searchspec->{src} ? 1 : 0)
+                    : ()),
+                pkgid =>
+                    { IN => $c->forward('distrib_search', [ $searchspec
+                ])->get_column('pkgid')->as_query, }, 
+                
+          
+        },
+        {
+            %$search_param,
+            select => [ 
+                "ts_rank_cd(to_tsvector('english', description),to_tsquery(?)) as rank",
+                'pkgid'
+            ],
+            bind => [ $tsquery ], 
+            order_by => [ 'rank desc', 'name', 'evr using >>', 'issrc' ],
+        },
+    )->all ]
+
 }
 

server/trunk/web/root/templates/html/0explorer/file.tt

@@ -4 +4 @@
 
 [% FOREACH file = xmlrpc %]
+[% info = c.forward('/rpms/info', [ file.pkgid ]) %]
 <a href="[% c.uri_for('/rpms', file.pkgid) %]">
-    [% c.forward('/rpms/info', [ file.pkgid ]).name | html %]
+    [% info.name | html %]-[% info.version %]-[% info.release %].[% info.arch %]
 </a><br>
 [% END %]

server/trunk/web/root/templates/html/explorer/index.html

@@ -1 +1 @@
 
-<p>[% path %]</p>
+<p>
+<a href="[% c.uri_for('/explorer') %]">/</a>
+[% FOREACH p = eachpath %]
+<a href="[% c.uri_for('/explorer', p.path) %]">[% p.dir | html %]</a>
+[% END %]
+</p>
 
 <div id="exp_dir" style="float: left; border: outset; width: 30%">
     Loading...
 </div>
-<div id="exp_file" style="float: left; border: outset; width: 30%">
+<div id="exp_file" style="float: left; border: outset; width: 60%">
     Loading...
 </div>

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

@@ -25 +25 @@
         <p id="sophie_menu">
         <span><a href="[% c.uri_for('/distrib') %]">Distribution</a></span>
+        <span><a href="[% c.uri_for('/explorer') %]">Explorer</a></span>
         </p>
     </div>

server/trunk/web/sophie.conf.in

@@ -5 +5 @@
 dbuser sophie
 dbpassword ****
+# max_reply 10000