X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoSearchContents.pm;fp=lib%2FPackages%2FDoSearchContents.pm;h=b86f2390fb7f172bdbd2e04872d0ff703c8a276d;hp=7ae679826ca29ef004bdc6925f0291981ea26ac9;hb=35b8995bea7a744e1b6e764de7b653469018ba3b;hpb=99974af07fe1aadba839a7216ebcbf3528cb1e00 diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm index 7ae6798..b86f239 100644 --- a/lib/Packages/DoSearchContents.pm +++ b/lib/Packages/DoSearchContents.pm @@ -30,6 +30,13 @@ sub do_search_contents { if ($params->{errors}{suite}) { fatal_error( _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} = [ 'stable' ]; + } + if (@{$opts->{suite}} > 1) { fatal_error( sprintf( _g( "more than one suite specified for contents search (%s)" ), "@{$opts->{suite}}" ) ); } @@ -52,9 +59,9 @@ sub do_search_contents { # for output my $keyword_enc = encode_entities $keyword || ''; my $searchon_enc = encode_entities $searchon; - 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}} ) ); + 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}} ), '&<>"' ); my $st0 = new Benchmark; my (@results); @@ -102,14 +109,19 @@ sub do_search_contents { debug( "Search took ".timestr($std) ) if DEBUG; } - my $suite_wording = $suites_enc eq "all" ? _g("all suites") - : sprintf(_g("suite(s) %s", $suites_enc) ); + my $suite_wording = sprintf(_g("suite %s"), $suites_enc ); my $section_wording = $sections_enc eq 'all' ? _g("all sections") - : sprintf(_g("section(s) %s", $sections_enc) ); + : sprintf(_g("section(s) %s"), $sections_enc ); my $arch_wording = $archs_enc eq 'any' ? _g("all architectures") - : sprintf(_g("architecture(s) %s", $archs_enc) ); - my $wording = $opts->{exact} ? _g("exact filenames") : _g("filenames that contain"); - $wording = _g("paths that end with") if $searchon eq "contents"; + : sprintf(_g("architecture(s) %s"), $archs_enc ); + my $wording = _g("filenames that contain"); + if ($searchon eq 'contents') { + if ($opts->{exact}) { + $wording = _g("files named"); + } else { + $wording = _g("paths that end with"); + } + } msg( sprintf( _g("You have searched for %s %s in %s, %s, and %s." ), $wording, $keyword_enc, $suite_wording, $section_wording, $arch_wording ) ); @@ -140,20 +152,45 @@ sub do_search_contents { $$page_content = ''; if (@results) { - $$page_content .= "
".sprintf( _g( 'Found %s results' ), - scalar @results )."
"; - $$page_content .= ''._g('File').' | '._g('Packages') - .' | ||||||
---|---|---|---|---|---|---|---|
/$file | ";
my %pkgs;
foreach (@$result) {
my ($pkg, $arch) = split /:/, $_;
+ next unless $opts->{h_archs}{$arch};
$pkgs{$pkg}{$arch}++;
+ $archs{$arch}++ unless $arch eq 'all';
+ }
+ next unless keys %pkgs;
+ $results{$file} = \%pkgs;
+ }
+ my @all_archs = keys %archs;
+ debug( "all_archs = @all_archs", 1 ) if DEBUG;
+
+ $$page_content .= " ".sprintf( _g( 'Found %s results' ), + scalar @results )." "; + $$page_content .= '
|