use strict;
use warnings;
-use Benchmark;
+use Benchmark ':hireswallclock';
use DB_File;
use URI::Escape;
use HTML::Entities;
our @EXPORT = qw( do_search_contents );
use Deb::Versions;
+use Packages::I18N::Locale;
use Packages::Search qw( :all );
use Packages::CGI;
use Packages::DB;
-use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_CGI $SEARCH_PAGE
+use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_PAGE
@SUITES @ARCHIVES $ROOT );
sub do_search_contents {
my ($params, $opts, $html_header, $menu, $page_content) = @_;
if ($params->{errors}{keywords}) {
- fatal_error( "keyword not valid or missing" );
+ fatal_error( _g( "keyword not valid or missing" ) );
} elsif (length($opts->{keywords}) < 2) {
- fatal_error( "keyword too short (keywords need to have at least two characters)" );
+ fatal_error( _g( "keyword too short (keywords need to have at least two characters)" ) );
+ }
+ if ($params->{errors}{suite}) {
+ fatal_error( _g( "suite not valid or not specified" ) );
+ }
+ if (@{$opts->{suite}} > 1) {
+ fatal_error( sprintf( _g( "more than one suite specified for contents search (%s)" ), "@{$opts->{suite}}" ) );
}
$$menu = "";
my $keyword = $opts->{keywords};
my $searchon = $opts->{searchon};
my $exact = $opts->{exact};
+ 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 $archs_enc = encode_entities( join( ', ', @{$params->{values}{arch}{no_replace}} ) );
my $st0 = new Benchmark;
- my (@results, @non_results);
+ my (@results);
unless (@Packages::CGI::fatal_errors) {
# full filename search is tricky
my $ffn = $searchon eq 'filenames';
- my $suite = 'stable'; #fixme
-
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', '--', "$DBDIR/contents/filenames_$suite.txt"
+ open FILENAMES, '-|', 'fgrep', '--', $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;
+
while (<FILENAMES>) {
chomp;
- last unless &searchfile(\@results, reverse($_)."/", \$nres, $reverses);
+ &searchfile(\@results, reverse($_)."/", \$nres, $reverses);
+ last if $Packages::Search::too_many_hits;
}
- close FILENAMES;
+ close FILENAMES or warn "fgrep error: $!\n";
} else {
$kw = reverse $kw;
# exact filename searching follows trivially:
$kw = "$kw/" if $exact;
- print "ERROR: Exact and fullfilenamesearch don't go along" if $ffn and $exact;
-
&searchfile(\@results, $kw, \$nres, $reverses);
}
$reverses = undef;
my $st1 = new Benchmark;
my $std = timediff($st1, $st0);
- debug( "Search took ".timestr($std) );
+ debug( "Search took ".timestr($std) ) if DEBUG;
}
my $suite_wording = $suites_enc eq "all" ? "all suites"
msg( "You have searched for ${wording} <em>$keyword_enc</em> in $suite_wording, $section_wording, and $arch_wording." );
if ($Packages::Search::too_many_hits) {
- error( "Your search was too wide so we will only display exact matches. At least <em>$Packages::Search::too_many_hits</em> results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords." );
+ error( _g( "Your search was too wide so we will only display only the first about 100 matches. Please consider using a longer keyword or more keywords." ) );
}
- $$page_content = '';
if (!@Packages::CGI::fatal_errors && !@results) {
- $$page_content .= "No results";
+ error( _g( "Nothing found" ) );
}
- %$html_header = ( title => 'Package Contents Search Results' ,
- lang => 'en',
- title_tag => 'Debian Package Contents Search Results',
+ %$html_header = ( title => _g( 'Package Contents Search Results' ),
+ lang => $opts->{lang},
+ title_tag => _g( 'Debian Package Contents Search Results' ),
print_title => 1,
print_search_field => 'packages',
search_field_values => {
},
);
+ $$page_content = '';
if (@results) {
- $$page_content .= scalar @results . " results displayed:<br>";
- foreach (@results) {
- $$page_content .= "<tt>$_</tt><br>\n";
+ $$page_content .= "<p>".sprintf( _g( 'Found %s results' ),
+ scalar @results )."</p>";
+ $$page_content .= '<div
+ id="pcontentsres"><table><colgroup><col><col></colgroup><tr><th>'._g('File').'</th><th>'._g('Packages')
+ .'</th></tr>';
+ foreach my $result (sort { $a->[0] cmp $b->[0] } @results) {
+ my $file = shift @$result;
+ $$page_content .= "<tr><td class=\"file\">/$file</td><td>";
+ my %pkgs;
+ foreach (@$result) {
+ my ($pkg, $arch) = split /:/, $_;
+ $pkgs{$pkg}{$arch}++;
+ }
+ $$page_content .= join( ", ", map { "<a href=\"$ROOT/$suite/$_\">$_</a>" } sort keys %pkgs);
+ $$page_content .= '</td>';
}
+ $$page_content .= '<tr><th>'._g('File').'</th><th>'._g('Packages').'</th></tr>' if @results > 20;
+ $$page_content .= '</table></div>';
}
} # sub do_search_contents
my ($results, $kw, $nres, $reverses) = @_;
my ($key, $value) = ($kw, "");
+ debug( "searchfile: kw=$kw", 1 ) if DEBUG;
for (my $status = $reverses->seq($key, $value, R_CURSOR);
$status == 0;
$status = $reverses->seq( $key, $value, R_NEXT)) {
# FIXME: what's the most efficient "is prefix of" thingy? We only want to know
# whether $kw is or is not a prefix of $key
last unless index($key, $kw) == 0;
+ debug( "found $key", 2 ) if DEBUG;
my @hits = split /\0/o, $value;
- push @$results, reverse($key)." is found in @hits";
+ push @$results, [ scalar reverse($key), @hits ];
last if ($$nres)++ > 100;
}
- return $$nres<100;
+ $Packages::Search::too_many_hits += $$nres - 100 if $$nres > 100;
}
projects / deb / packages.git / blobdiff