use Benchmark ':hireswallclock';
use DB_File;
-use URI::Escape;
-use HTML::Entities;
use Exporter;
our @ISA = qw( Exporter );
our @EXPORT = qw( do_search_contents );
use Deb::Versions;
use Packages::I18N::Locale;
use Packages::Search qw( :all );
-use Packages::CGI;
+use Packages::CGI qw( :DEFAULT error );
use Packages::DB;
use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @ARCHITECTURES $ROOT );
sub do_search_contents {
my ($params, $opts, $page_content) = @_;
+ my $cat = $opts->{cat};
if ($params->{errors}{keywords}) {
- fatal_error( _g( "keyword not valid or missing" ) );
+ fatal_error( $cat->g( "keyword not valid or missing" ) );
$opts->{keywords} = [];
} elsif (grep { length($_) < 2 } @{$opts->{keywords}}) {
- fatal_error( _g( "keyword too short (keywords need to have at least two characters)" ) );
+ fatal_error( $cat->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" ) );
+ fatal_error( $cat->g( "suite not valid or not specified" ) );
}
#FIXME: that's extremely hacky atm
if ($params->{values}{suite}{no_replace}[0] eq 'default') {
$params->{values}{suite}{no_replace} =
- $params->{values}{suite}{final} = $opts->{suite} = [ 'etch' ];
+ $params->{values}{suite}{final} = $opts->{suite} = [ 'jaunty' ];
}
if (@{$opts->{suite}} > 1) {
- fatal_error( sprintf( _g( "more than one suite specified for contents search (%s)" ), "@{$opts->{suite}}" ) );
+ fatal_error( $cat->g( "more than one suite specified for contents search (%s)",
+ "@{$opts->{suite}}" ) );
}
my @keywords = @{$opts->{keywords}};
# full filename search is tricky
my $ffn = $mode eq 'filename';
+ unless (-e "$DBDIR/contents/reverse_$suite.db") {
+ fatal_error($cat->g("No contents information available for this suite"));
+ return;
+ }
my $reverses = tie my %reverses, 'DB_File', "$DBDIR/contents/reverse_$suite.db",
O_RDONLY, 0666, $DB_BTREE
or die "Failed opening reverse DB: $!";
&searchfile(\@results, reverse($_)."/", \$nres, $reverses);
last if $Packages::Search::too_many_hits;
}
+ while (<FILENAMES>) {};
close FILENAMES or warn "fgrep error: $!\n";
} else {
- error(_g("The search mode you selected doesn't support more than one keyword."))
+ error($cat->g("The search mode you selected doesn't support more than one keyword."))
if @keywords;
my $kw = reverse $first_kw;
my $file = shift @$result;
my %pkgs;
foreach (@$result) {
- my ($pkg, $arch) = split /:/, $_;
+ my ($pkg, $arch) = split m/:/, $_;
next unless $opts->{h_archs}{$arch};
$pkgs{$pkg}{$arch}++;
$archs{$arch}++ unless $arch eq 'all';
$page_content->{suite} = $suite;
$page_content->{archive} = $archive;
$page_content->{all_architectures} = \@all_archs;
- $page_content->{all_suites} = \@SUITES;
+ $page_content->{all_suites} = [ grep { $_ !~ /-(updates|backports)$/ } @SUITES ];
$page_content->{mode} = $mode;
$page_content->{search_architectures} = $opts->{arch};
$page_content->{search_keywords} = $opts->{keywords};
last unless index($key, $kw) == 0;
debug( "found $key", 2 ) if DEBUG;
- my @hits = split /\0/o, $value;
- push @$results, [ scalar reverse($key), @hits ];
+ my @files = split /\001/o, $value;
+ foreach my $f (@files) {
+ my @hits = split /\0/o, $f;
+ my $file = shift @hits;
+ if ($file eq '-') {
+ $file = reverse($key);
+ }
+ push @$results, [ $file, @hits ];
+ }
last if ($$nres)++ > 100;
}