Changeset 86

Timestamp:

12/06/10 13:59:09 (13 years ago)

Author:

nanardon

Message:

• add search over files

Location:

server/trunk/web/lib/Sophie

Files:

• Base/Result/Files.pm (modified) (1 diff)
• Base/Result/Rpms.pm (modified) (1 diff)
• Base/Result/SrcFiles.pm (added)
• Controller/Search.pm (modified) (4 diffs)

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

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

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

@@ -11 +11 @@
 __PACKAGE__->has_many(Deps => 'Sophie::Base::Result::Deps', 'pkgid');
 __PACKAGE__->has_many(Files => 'Sophie::Base::Result::Files', 'pkgid');
+__PACKAGE__->has_many(SrcFiles => 'Sophie::Base::Result::SrcFiles', 'pkgid');
 __PACKAGE__->has_many(Tags => 'Sophie::Base::Result::Tags', 'pkgid');
 

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', [ undef, grep { $_ } split(/\s/, $c->req->param('search')) ]);
-        my $pager = $c->stash->{rs}->pager;
-        $c->stash->{pager} = $pager;
-        $c->stash->{xmlrpc} = {
-            results => [ $c->stash->{rs}->get_column('pkgid')->all ],
-            pages => $pager->last_page,
-            current_page => $pager->current_page,
-            total_entries => $pager->total_entries,
-            entries_per_page => $pager->entries_per_page,
-        };
-    }
-}
-
-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} = $c->req->param('rows') || 15;
-    }
-    return $r;
-}
-
 sub distrib_search : Private {
     my ( $self, $c, $searchspec ) = @_;
@@ -75 +39 @@
     my ( $self, $c, $searchspec ) = @_;
 
+    $searchspec ||= {};
     my $rs = $c->stash->{rs}->search(
         {},
@@ -92 +57 @@
         };
     }
-    $c->stash->{xmlrpc}{results} = [ $rs->get_column('pkgid')->all ];
+    $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
+        ];
+    }
     return $c->stash->{xmlrpc};
-}
-
-sub bypkgid : XMLRPCPath('/search/rpm/bypkgid') {
-    my ( $self, $c, $searchspec, $pkgid ) = @_;
-
-    $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
-        {
-            -and => [ 
-                (exists($searchspec->{src})
-                    ? { issrc => $searchspec->{src} ? 1 : 0 }
-                    : ()),
-                { pkgid => $pkgid }, 
-                { pkgid =>
-                    { IN => $c->forward('distrib_search', [ $searchspec
-                        ])->get_column('pkgid')->as_query, }, 
-                },
-            ]     
-        },
-    );
-
-    $c->forward('format_search', $searchspec);
-}
-
-sub bytag : XMLRPCPath('/search/rpm/bytag') {
-    my ( $self, $c, $searchspec, $tag, $tagvalue ) = @_;
-
-    my $tagrs = $c->model('Base')->resultset('Tags')
-        ->search({ tagname => lc($tag), value => $tagvalue})
-        ->get_column('pkgid');
-    $c->stash->{rs} = $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, }, 
-                },
-            ]     
-        },
-    );
-    $c->forward('format_search', $searchspec);
-
-}
-
-sub bydep : XMLRPCPath('/search/rpm/bydep') {
-    my ( $self, $c, $searchspec, $deptype, $depname, $depsense, $depevr ) = @_;
-
-    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');
-    $c->stash->{rs} = $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, }, 
-                },
-            ]     
-        },
-    );
-    $c->forward('format_search', $searchspec);
-}
-
-sub byfile : XMLRPCPath('/search/rpm/byfile') {
-    my ( $self, $c, $searchspec, $file) = @_;
-    my ($dirname, $basename) = $file =~ m:^(.*/)?([^/]+)$:;
-
-    my $filers = $c->model('Base')->resultset('Files')
-    ->search({
-            ($dirname
-                ? (dirname => $dirname)
-                : ()),
-            basename => $basename,
-        })
-    ->get_column('pkgid');
-    $c->stash->{rs} = $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, }, 
-                },
-            ]     
-        },
-    );
-    $c->forward('format_search', $searchspec);
-}
-
-sub fuzzy : XMLRPCPath('/search/rpm/fuzzy') {
-    my ($self, $c, $searchspec, $name) = @_;
-
-    my $deprs = $c->model('Base')->resultset('Deps')->search(
-        { deptype => 'P', depname => { '~*' => $name } }
-    )->get_column('pkgid');
-
-    $c->stash->{rs} = 
-
-        $c->model('Base')->resultset('Rpms')->search(
-        {
-            -and => [
-                (exists($searchspec->{src})
-                    ? { issrc => $searchspec->{src} ? 1 : 0 }
-                    : ()),
-                { -or => [
-                    { name => 
-                        { '~*' => $name, },
-                    },
-#                    { pkgid =>
-#                        { IN => $deprs->as_query, },
-#                    },
-                     ]
-                },
-                { pkgid =>
-                    { IN => $c->forward('distrib_search', [ $searchspec
-                        ])->get_column('pkgid')->as_query, }, 
-                },
-            ]     
-        },
-        $c->forward('search_param'),
-    );
-    
-    $c->forward('format_search', $searchspec);
-}
-
-sub quick : XMLRPCPath('/search/rpm/quick') {
-    my ($self, $c, $searchspec, @keywords) = @_;
-    my $tsquery = join(' & ', map { $_ =~ s/ /\\ /g; $_ } @keywords);
-    $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
-            {
-                -or => [
-                    { -nest => \[
-                        "to_tsvector('english', description) @@ to_tsquery(?)",
-                        [ plain_text => $tsquery],
-                    ], },
-                    {
-                    name => [ @keywords ],
-                    },
-                ],
-            (exists($searchspec->{src})
-                ? (issrc => $searchspec->{src} ? 1 : 0)
-                : ()),
-            pkgid =>
-            { IN => $c->forward('distrib_search', [ $searchspec
-                    ])->get_column('pkgid')->as_query, }, 
-
-
-        },
-        {
-            %{$c->forward('search_param')},
-        },
-    );
-    $c->forward('format_search', $searchspec);
-}
-
-sub description : XMLRPCPath('/search/rpm/description') {
-    my ($self, $c, $searchspec, @keywords) = @_;
-    my $tsquery = join(' & ', map { $_ =~ s/ /\\ /g; $_ } @keywords);
-    $c->stash->{rs} = $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, }, 
-                
-          
-        },
-        {
-            %{$c->forward('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' ],
-        },
-    );
-    $c->forward('format_search', $searchspec);
 }
 
@@ -420 +188 @@
 }
 
+sub bypkgid : XMLRPCPath('/search/rpm/bypkgid') {
+    my ( $self, $c, $searchspec, $pkgid ) = @_;
+
+    $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
+        {
+            -and => [ 
+                (exists($searchspec->{src})
+                    ? { issrc => $searchspec->{src} ? 1 : 0 }
+                    : ()),
+                { pkgid => $pkgid }, 
+                { pkgid =>
+                    { IN => $c->forward('distrib_search', [ $searchspec
+                        ])->get_column('pkgid')->as_query, }, 
+                },
+            ]     
+        },
+    );
+
+    $c->forward('format_search', $searchspec);
+}
+
+=head2 search.rpm.byname (SEARCHSPEC, NAME, [SENSE, EVR])
+
+Search package by its NAME. SENSE and EVR are optional version filter where
+SENSE is dependency sign (C<E<gt>>, C<=>, ...) and EVR the search version as
+either C<VERSION>, C<VERSION-RELEASE> or C<EPOCH:VERSION-RELEASE>.
+
+SEARCHSPEC is a struct with search options.
+
+=cut
+
+sub byname : XMLRPCPath('/search/rpm/byname') {
+    my ( $self, $c, $searchspec, $name, $sense, $evr ) = @_;
+
+    $searchspec ||= {};
+    $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
+        {
+            -and => [ 
+                (exists($searchspec->{src})
+                    ? { issrc => $searchspec->{src} ? 1 : 0 }
+                    : ()),
+                { name => $name },
+                ( $evr
+                    ? { -nest => \[ 
+                        "rpmdepmatch(rpmsenseflag('='), evr, rpmsenseflag(?), ?)",
+                        [ plain_text => $sense],
+                        [ plain_text => $evr ],
+                    ] }
+                    : ()),
+                { pkgid =>
+                    { IN => $c->forward('distrib_search', [ $searchspec
+                        ])->get_column('pkgid')->as_query, }, 
+                },
+            ]     
+        },
+    );
+    $c->forward('format_search', $searchspec);
+
+}
+
+sub bytag : XMLRPCPath('/search/rpm/bytag') {
+    my ( $self, $c, $searchspec, $tag, $tagvalue ) = @_;
+
+    my $tagrs = $c->model('Base')->resultset('Tags')
+        ->search({ tagname => lc($tag), value => $tagvalue})
+        ->get_column('pkgid');
+    $c->stash->{rs} = $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, }, 
+                },
+            ]     
+        },
+    );
+    $c->forward('format_search', $searchspec);
+
+}
+
+sub bydep : XMLRPCPath('/search/rpm/bydep') {
+    my ( $self, $c, $searchspec, $deptype, $depname, $depsense, $depevr ) = @_;
+
+    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');
+    $c->stash->{rs} = $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, }, 
+                },
+            ]     
+        },
+    );
+    $c->forward('format_search', $searchspec);
+}
+
+sub byfile : XMLRPCPath('/search/rpm/byfile') {
+    my ( $self, $c, $searchspec, $file) = @_;
+    my ($dirname, $basename) = $file =~ m:^(.*/)?([^/]+)$:;
+
+    my $filers = $c->model('Base')->resultset('Files')
+    ->search({
+            ($dirname
+                ? (dirname => $dirname)
+                : ()),
+            basename => $basename,
+        })
+    ->get_column('pkgid');
+    $c->stash->{rs} = $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, }, 
+                },
+            ]     
+        },
+    );
+    $c->forward('format_search', $searchspec);
+}
+
+sub fuzzy : XMLRPCPath('/search/rpm/fuzzy') {
+    my ($self, $c, $searchspec, $name) = @_;
+
+    my $deprs = $c->model('Base')->resultset('Deps')->search(
+        { deptype => 'P', depname => { '~*' => $name } }
+    )->get_column('pkgid');
+
+    $c->stash->{rs} = 
+
+        $c->model('Base')->resultset('Rpms')->search(
+        {
+            -and => [
+                (exists($searchspec->{src})
+                    ? { issrc => $searchspec->{src} ? 1 : 0 }
+                    : ()),
+                { -or => [
+                    { name => 
+                        { '~*' => $name, },
+                    },
+#                    { pkgid =>
+#                        { IN => $deprs->as_query, },
+#                    },
+                     ]
+                },
+                { pkgid =>
+                    { IN => $c->forward('distrib_search', [ $searchspec
+                        ])->get_column('pkgid')->as_query, }, 
+                },
+            ]     
+        },
+        $c->forward('search_param'),
+    );
+    
+    $c->forward('format_search', $searchspec);
+}
+
+sub quick : XMLRPCPath('/search/rpm/quick') {
+    my ($self, $c, $searchspec, @keywords) = @_;
+    my $tsquery = join(' & ', map { $_ =~ s/ /\\ /g; $_ } @keywords);
+    $c->stash->{rs} = $c->model('Base')->resultset('Rpms')->search(
+            {
+                -or => [
+                    { -nest => \[
+                        "to_tsvector('english', description) @@ to_tsquery(?)",
+                        [ plain_text => $tsquery],
+                    ], },
+                    {
+                    name => [ @keywords ],
+                    },
+                ],
+            (exists($searchspec->{src})
+                ? (issrc => $searchspec->{src} ? 1 : 0)
+                : ()),
+            pkgid =>
+            { IN => $c->forward('distrib_search', [ $searchspec
+                    ])->get_column('pkgid')->as_query, }, 
+
+
+        },
+        {
+            %{$c->forward('search_param')},
+        },
+    );
+    $c->forward('format_search', $searchspec);
+}
+
+sub description : XMLRPCPath('/search/rpm/description') {
+    my ($self, $c, $searchspec, @keywords) = @_;
+    my $tsquery = join(' & ', map { $_ =~ s/ /\\ /g; $_ } @keywords);
+    $c->stash->{rs} = $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, }, 
+                
+          
+        },
+        {
+            %{$c->forward('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' ],
+        },
+    );
+    $c->forward('format_search', $searchspec);
+}
+
+sub file_search : XMLRPCPath('/search/file/byname') {
+    my ( $self, $c, $searchspec, $file) = @_;
+    my ($dirname, $basename) = $file =~ m:^(.*/)?([^/]+)$:;
+    $searchspec ||= {};
+
+    my $filers = $c->stash->{rs} = $c->model('Base::Files')
+    ->search(
+        {
+            -and => [
+                ($dirname
+                    ? (dirname => $dirname)
+                    : ()),
+                basename => $basename,
+                pkgid => {
+                    IN => $c->forward('distrib_search',
+                        [ $searchspec ])->get_column('pkgid')->as_query,
+                },
+            ],
+        }
+    );
+    
+    $c->stash->{column} = \qw(basename);
+    
+    $c->forward('format_search', $searchspec);
+}
+
 =head1 AUTHOR