X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cgi-bin%2Fsearch_packages.pl;h=8e26b1154bd562b6c18b01fbaee4fcb5c683ede6;hb=bcbeaca96ba2c409e061b64807b986e4b8464192;hp=e7cb3b6ad32c358166aaa19fd2013ccdc112fd4c;hpb=3210a2b7d904e95b48ebbd84afa2bf1875544e8e;p=deb%2Fpackages.git

diff --git a/cgi-bin/search_packages.pl b/cgi-bin/search_packages.pl
index e7cb3b6..8e26b11 100755
--- a/cgi-bin/search_packages.pl
+++ b/cgi-bin/search_packages.pl
@@ -157,6 +157,10 @@ unless (@Packages::CGI::fatal_errors) {
 	push @results, @{ do_names_search( $keyword, \%sources,
 					   $sp_obj,
 					   \&read_src_entry, \%opts ) };
+    } elsif ($searchon eq 'contents') {
+	require "./search_contents.pl";
+	&contents(\$input);
+	exit;
     } else {
 	push @results, @{ do_names_search( $keyword, \%packages,
 					   $p_obj,
@@ -274,12 +278,13 @@ if (@results) {
 
 my @pkgs = sort(keys %pkgs, keys %provided_by);
 	if ($opts{format} eq 'html') {
-	    my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts );
-	    my $count = 0;
+	    #my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts );
+	    print "<p>Found <em>".(scalar @pkgs)."</em> matching packages,";
+	    #my $count = 0;
 	
 	    foreach my $pkg (@pkgs) {
-		$count++;
-		next if $count < $start or $count > $end;
+		#$count++;
+		#next if $count < $start or $count > $end;
 		printf "<h3>Package %s</h3>\n", $pkg;
 		print "<ul>\n";
 		foreach my $suite (@SUITES) {
@@ -289,7 +294,7 @@ my @pkgs = sort(keys %pkgs, keys %provided_by);
 			    my @versions = version_sort keys %{$pkgs{$pkg}{$suite}{$archive}};
 			    my $origin_str = "";
 			    if ($sect{$pkg}{$suite}{$archive}{$versions[0]}) {
-				$origin_str .= " [<span style=\"color:red\">$sect{$pkg}{$suite}{$versions[0]}</span>]";
+				$origin_str .= " [<span style=\"color:red\">$sect{$pkg}{$suite}{$archive}{$versions[0]}</span>]";
 			    }
 			    printf "<li><a href=\"$ROOT/%s/%s\">%s</a> (%s): %s   %s\n",
 			    $path, $pkg, $path, $subsect{$pkg}{$suite}{$archive}{$versions[0]},
@@ -329,12 +334,13 @@ my @pkgs = sort(keys %pkgs, keys %provided_by);
 	}
 
 	if ($opts{format} eq 'html') {
-	    my ($start, $end) = multipageheader( $input, scalar keys %pkgs, \%opts );
-	    my $count = 0;
+	    #my ($start, $end) = multipageheader( $input, scalar keys %pkgs, \%opts );
+	    print "<p>Found <em>".(scalar keys %pkgs)."</em> matching packages,";
+	    #my $count = 0;
 	    
 	    foreach my $pkg (sort keys %pkgs) {
-		$count++;
-		next if ($count < $start) or ($count > $end);
+		#$count++;
+		#next if ($count < $start) or ($count > $end);
 		printf "<h3>Source package %s</h3>\n", $pkg;
 		print "<ul>\n";
 		foreach my $suite (@SUITES) {
@@ -364,7 +370,7 @@ my @pkgs = sort(keys %pkgs, keys %provided_by);
 	    }
 	}
     }
-    printindexline( $input, scalar keys %pkgs, \%opts );
+    #printindexline( $input, scalar keys %pkgs, \%opts );
 }
 #print_results(\@results, \%opts) if @results;;
 my $tet1 = new Benchmark;