X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoSearchContents.pm;h=b86f2390fb7f172bdbd2e04872d0ff703c8a276d;hb=35b8995bea7a744e1b6e764de7b653469018ba3b;hp=cbca011230b39c8e18763d1989d3032f3d4da904;hpb=dc7ba128afd5ada5a46fcab7dfb6d8d9689152d1;p=deb%2Fpackages.git

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index cbca011..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);
@@ -99,18 +106,25 @@ sub do_search_contents {
     
 	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"
-	: "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 ) );
 
     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." ) );
@@ -138,20 +152,45 @@ sub do_search_contents {
 
     $$page_content = '';
     if (@results) {
-	$$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>';
+	my (%results,%archs);
 	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 /:/, $_;
+		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 .= "<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 $file (sort keys %results) {
+	    $$page_content .= "<tr><td class=\"file\">/$file</td><td>";
+	    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=\"$ROOT/$suite/$pkg\">$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;
@@ -164,7 +203,7 @@ sub searchfile
     my ($results, $kw, $nres, $reverses) = @_;
 
     my ($key, $value) = ($kw, "");
-    debug( "searchfile: kw=$kw", 1 );
+    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)) {
@@ -172,7 +211,7 @@ sub searchfile
 	# 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 );
+	debug( "found $key", 2 ) if DEBUG;
 
 	my @hits = split /\0/o, $value;
 	push @$results, [ scalar reverse($key), @hits ];