X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoSearchContents.pm;h=b8698cc3b592830a0add06d4e3284ba5ba4c67a2;hb=3f085acbf01251255c4f6e4786b0439ff424d979;hp=b86f2390fb7f172bdbd2e04872d0ff703c8a276d;hpb=35b8995bea7a744e1b6e764de7b653469018ba3b;p=deb%2Fpackages.git
diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index b86f239..b8698cc 100644
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -17,14 +17,14 @@ use Packages::Search qw( :all );
use Packages::CGI;
use Packages::DB;
use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_PAGE
- @SUITES @ARCHIVES $ROOT );
+ @SUITES @ARCHIVES @ARCHITECTURES $ROOT );
sub do_search_contents {
my ($params, $opts, $html_header, $menu, $page_content) = @_;
if ($params->{errors}{keywords}) {
fatal_error( _g( "keyword not valid or missing" ) );
- } elsif (length($opts->{keywords}) < 2) {
+ } elsif (grep { length($_) < 2 } @{$opts->{keywords}}) {
fatal_error( _g( "keyword too short (keywords need to have at least two characters)" ) );
}
if ($params->{errors}{suite}) {
@@ -43,22 +43,20 @@ sub do_search_contents {
$$menu = "";
- my $keyword = $opts->{keywords};
- my $searchon = $opts->{searchon};
- my $exact = $opts->{exact};
+ my @keywords = @{$opts->{keywords}};
+ my $mode = $opts->{mode} || '';
my $suite = $opts->{suite}[0];
my $archive = $opts->{archive}[0] ||'';
$Packages::Search::too_many_hits = 0;
# for URL construction
- my $keyword_esc = uri_escape( $keyword );
+ my $keyword_esc = uri_escape( "@keywords" );
my $suites_param = join ',', @{$params->{values}{suite}{no_replace}};
my $sections_param = join ',', @{$params->{values}{section}{no_replace}};
my $archs_param = join ',', @{$params->{values}{arch}{no_replace}};
# for output
- my $keyword_enc = encode_entities $keyword || '';
- my $searchon_enc = encode_entities $searchon;
+ my $keyword_enc = encode_entities "@keywords" || '';
my $suites_enc = encode_entities( join( ', ', @{$params->{values}{suite}{no_replace}} ), '&<>"' );
my $sections_enc = encode_entities( join( ', ', @{$params->{values}{section}{no_replace}} ), '&<>"' );
my $archs_enc = encode_entities( join( ', ', @{$params->{values}{arch}{no_replace}} ), '&<>"' );
@@ -70,33 +68,37 @@ sub do_search_contents {
my $nres = 0;
- my $kw = lc $keyword;
+ my $first_kw = lc shift @keywords;
# full filename search is tricky
- my $ffn = $searchon eq 'filenames';
+ my $ffn = $mode eq 'filename';
my $reverses = tie my %reverses, 'DB_File', "$DBDIR/contents/reverse_$suite.db",
O_RDONLY, 0666, $DB_BTREE
or die "Failed opening reverse DB: $!";
if ($ffn) {
- open FILENAMES, '-|', 'fgrep', '--', $kw, "$DBDIR/contents/filenames_$suite.txt"
+ open FILENAMES, '-|', 'fgrep', '--', $first_kw, "$DBDIR/contents/filenames_$suite.txt"
or die "Failed opening filename table: $!";
- error( _g( "Exact and fullfilenamesearch don't go along" ) )
- if $ffn and $exact;
-
+ FILENAME:
while ( ".sprintf( _g( 'Found %s results' ),
- scalar @results )."
'._g('File').' | '._g('Packages') - .' |
---|---|
/$file | "; + my $file_enc = encode_entities($file); + foreach my $kw (@{$opts->{keywords}}) { + my $kw_enc = encode_entities($kw); + $file_enc =~ s#(\Q$kw_enc\E)#$1#g; + } + $$page_content .= " |
/$file_enc | "; my @pkgs; foreach my $pkg (sort keys %{$results{$file}}) { my $arch_str = ''; @@ -188,12 +218,12 @@ sub do_search_contents { join(' ', grep { !$results{$file}{$pkg}{$_} } @all_archs).']'; } } - push @pkgs, "$pkg$arch_str"; + push @pkgs, "$suite})."\">$pkg$arch_str"; } $$page_content .= join( ", ", @pkgs); - $$page_content .= ' | '; + $$page_content .= "
'._g('File').' | '._g('Packages').' |
'._g('File').' | '._g('Packages')." |