X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoSearchContents.pm;h=3079f92de025aedd126746745b47f8fe6a1a40a2;hb=3b258411d0d4c2c0f1f89675d9e01272f0b5d4d7;hp=e86fc789783ef06dcecd7e9442535db7530f4c78;hpb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index e86fc78..3079f92 100644
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -17,7 +17,7 @@ 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) = @_;
@@ -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,24 +109,31 @@ sub do_search_contents {
 	debug( "Search took ".timestr($std) ) if DEBUG;
     }
     
-    my $suite_wording = $suites_enc eq "all" ? "all suites"
-	: "suite(s) <em>$suites_enc</em>";
-    my $section_wording = $sections_enc eq 'all' ? "all sections"
-	: "section(s) <em>$sections_enc</em>";
-    my $arch_wording = $archs_enc eq 'any' ? "all architectures"
-	: "architecture(s) <em>$archs_enc</em>";
-    my $wording = $opts->{exact} ? "exact filenames" : "filenames that contain";
-    $wording = "paths that end with" if $searchon eq "contents";
-    msg( "You have searched for ${wording} <em>$keyword_enc</em> in $suite_wording, $section_wording, and $arch_wording." );
+    my $suite_wording = sprintf(_g("suite <em>%s</em>"), $suites_enc );
+    my $section_wording = $sections_enc eq 'all' ? _g("all sections")
+	: sprintf(_g("section(s) <em>%s</em>"), $sections_enc );
+    my $arch_wording = $archs_enc eq 'any' ? _g("all architectures")
+	: sprintf(_g("architecture(s) <em>%s</em>"), $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 <em>%s</em> in %s, %s, and %s." ),
+		  $wording, $keyword_enc,
+		  $suite_wording, $section_wording, $arch_wording ) );
+
+    msg( _g("Search in other suite:")." ".
+	 join( ' ', map { '[<a href="'.make_search_url('',"keywords=$keyword_esc",{suite=>$_}).
+			      "\">$_</a>]" } @SUITES ) );
 
     if ($Packages::Search::too_many_hits) {
 	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." ) );
     }
     
-    if (!@Packages::CGI::fatal_errors && !@results) {
-	error( _g( "Nothing found" ) );
-    }
-
     %$html_header = ( title => _g( 'Package Contents Search Results' ),
 		      lang => $opts->{lang},
 		      title_tag => _g( 'Debian Package Contents Search Results' ),
@@ -137,21 +151,58 @@ sub do_search_contents {
 		      );
 
     $$page_content = '';
-    if (@results) {
+    my (%results,%archs);
+    foreach my $result (sort { $a->[0] cmp $b->[0] } @results) {
+	my $file = shift @$result;
+	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;
+    @all_archs = @ARCHITECTURES unless @all_archs;
+    debug( "all_archs = @all_archs", 1 ) if DEBUG;
+    msg(_g("Limit search to a specific architecture:")." ".
+	join( ' ', map { '[<a href="'.make_search_url('',"keywords=$keyword_esc",{arch=>$_}).
+			     "\">$_</a>]" } @all_archs ) )
+	unless (@{$opts->{arch}} == 1) || (@all_archs == 1);
+    msg(sprintf(_g('Search in <a href="%s">all architectures</a>'),
+		make_search_url('',"keywords=$keyword_esc",{arch=>undef})))
+	if @{$opts->{arch}} == 1;
+
+    if (!@Packages::CGI::fatal_errors && !keys(%results)) {
+	error( _g( "Nothing found" ) );
+    }
+
+    if (keys %results) {
 	$$page_content .= "<p>".sprintf( _g( 'Found %s results' ),
-					 scalar @results )."</p>";
+					 scalar keys %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;
+	foreach my $file (sort keys %results) {
 	    $$page_content .= "<tr><td class=\"file\">/$file</td><td>";
-	    my %pkgs;
-	    foreach (@$result) {
-		my ($pkg, $arch) = split /:/, $_;
-		$pkgs{$pkg}{$arch}++;
+	    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, "<a href=\"".make_url($pkg,'',{suite=>$suite})."\">$pkg</a>$arch_str";
 	    }
-	    $$page_content .= join( ", ", map { "<a href=\"$ROOT/$suite/$_\">$_</a>" } sort keys %pkgs);
+	    $$page_content .= join( ", ", @pkgs);
 	    $$page_content .= '</td>';
 	}
 	$$page_content .= '<tr><th>'._g('File').'</th><th>'._g('Packages').'</th></tr>' if @results > 20;