From: Frank Lichtenheld Date: Thu, 2 Mar 2006 00:02:50 +0000 (+0000) Subject: Fix some issues in contents search: X-Git-Tag: switch-to-templates~23 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=35b8995bea7a744e1b6e764de7b653469018ba3b;p=deb%2Fpackages.git Fix some issues in contents search: - default to 'stable' not 'all suites' because the latter isn't supported - add architecture handling - fix some problems and errors in the msg handling --- diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl index 5f0b0ef..50a92f6 100755 --- a/cgi-bin/dispatcher.pl +++ b/cgi-bin/dispatcher.pl @@ -168,9 +168,10 @@ my %params_def = ( keywords => { default => undef, package => { default => undef, match => '^([\w.+-]+)$', var => \$pkg }, - suite => { default => 'all', match => '^([\w-]+)$', + suite => { default => 'default', match => '^([\w-]+)$', array => ',', var => \@suites, - replace => { all => \@SUITES } }, + replace => { all => \@SUITES, + default => \@SUITES } }, archive => { default => ($what_to_do eq 'search') ? 'all' : 'default', match => '^([\w-]+)$', diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm index a889ef5..35ee88f 100644 --- a/lib/Packages/DoSearch.pm +++ b/lib/Packages/DoSearch.pm @@ -83,7 +83,7 @@ sub do_search { my $std = timediff($st1, $st0); debug( "Search took ".timestr($std) ) if DEBUG; - my $suite_wording = $suites_enc eq "all" ? _g("all suites") + my $suite_wording = $suites_enc =~ /^(default|all)$/ ? _g("all suites") : sprintf(_g("suite(s) %s", $suites_enc) ); my $section_wording = $sections_enc eq 'all' ? _g("all sections") : sprintf(_g("section(s) %s", $sections_enc) ); 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 .= '
'; + my (%results,%archs); foreach my $result (sort { $a->[0] cmp $b->[0] } @results) { my $file = shift @$result; - $$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 .= '
'; + foreach my $file (sort keys %results) { + $$page_content .= "'; } $$page_content .= '' if @results > 20;
'._g('File').''._g('Packages') + .'
/$file"; + my @pkgs; + foreach my $pkg (sort keys %{$results{$file}}) { + my $arch_str = ''; + my @archs = keys %{$results{$file}{$pkg}}; + unless ($results{$file}{$pkg}{all} || + (@archs == @all_archs)) { + if (@archs < @all_archs/2) { + $arch_str = ' ['.join(' ',sort @archs).']'; + } else { + $arch_str = ' ['._g('not').' '. + join(' ', grep { !$results{$file}{$pkg}{$_} } @all_archs).']'; + } + } + push @pkgs, "$pkg$arch_str"; } - $$page_content .= join( ", ", map { "$_" } sort keys %pkgs); + $$page_content .= join( ", ", @pkgs); $$page_content .= '
'._g('File').''._g('Packages').'