X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cgi-bin%2Fsearch_packages.pl;h=d8d26410cff7db68c513d8176e38e125074f5ec4;hb=d9c10aaf0bb03bfb75404f9041967b9f91012bdb;hp=35729156a5011cba138fb90c3f01997fdf75bdac;hpb=dc9512b1309f4c8c6bd1171b543183e8ac8b2115;p=deb%2Fpackages.git

diff --git a/cgi-bin/search_packages.pl b/cgi-bin/search_packages.pl
index 3572915..d8d2641 100755
--- a/cgi-bin/search_packages.pl
+++ b/cgi-bin/search_packages.pl
@@ -19,7 +19,7 @@ use POSIX;
 use URI::Escape;
 use HTML::Entities;
 use DB_File;
-use Benchmark;
+use Benchmark ':hireswallclock';
 
 use Deb::Versions;
 use Packages::Config qw( $DBDIR $ROOT $SEARCH_CGI $SEARCH_PAGE
@@ -113,7 +113,7 @@ my %params = Packages::Search::parse_params( $input, \%params_def, \%opts );
 #XXX: Don't use alternative output formats yet
 $format = 'html';
 if ($format eq 'html') {
-    print $input->header;
+    print $input->header( -charset => 'utf-8' );
 }
 
 if ($params{errors}{keywords}) {
@@ -157,6 +157,9 @@ 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);
     } else {
 	push @results, @{ do_names_search( $keyword, \%packages,
 					   $p_obj,
@@ -252,7 +255,7 @@ print_errors();
 print_hints();
 print_debug();
 if (@results) {
-    my (%pkgs, %subsect, %sect, %desc, %binaries, %provided_by);
+    my (%pkgs, %subsect, %sect, %archives, %desc, %binaries, %provided_by);
 
     unless ($opts{searchon} eq 'sourcenames') {
 	foreach (@results) {
@@ -261,10 +264,18 @@ if (@results) {
 	
 	    my ($pkg) = $pkg_t =~ m/^(.+)/; # untaint
 	    if ($arch ne 'virtual') {
+		my $real_archive;
+		if ($archive =~ /^(security|non-US)$/) {
+		    $real_archive = $archive;
+		    $archive = 'us';
+		}
+
 		$pkgs{$pkg}{$suite}{$archive}{$version}{$arch} = 1;
 		$subsect{$pkg}{$suite}{$archive}{$version} = $subsection;
 		$sect{$pkg}{$suite}{$archive}{$version} = $section
 		    unless $section eq 'main';
+		$archives{$pkg}{$suite}{$archive}{$version} = $real_archive
+		    if $real_archive;
 		
 		$desc{$pkg}{$suite}{$archive}{$version} = $desc;
 	    } else {
@@ -274,30 +285,42 @@ 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) {
 		    foreach my $archive (@ARCHIVES) {
+                        next if $archive eq 'security';
+                        next if $archive eq 'non-US';
 			my $path = $suite.(($archive ne 'us')?"/$archive":'');
 			if (exists $pkgs{$pkg}{$suite}{$archive}) {
+			    my %archs_printed;
 			    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]},
 			    $desc{$pkg}{$suite}{$archive}{$versions[0]}, $origin_str;
 			    
 			    foreach my $v (@versions) {
-				printf "<br>%s: %s\n",
-				$v, join (" ", (sort keys %{$pkgs{$pkg}{$suite}{$archive}{$v}}) );
+				my $archive_str = "";
+				if ($archives{$pkg}{$suite}{$archive}{$v}) {
+				    $archive_str .= " [<span style=\"color:red\">$archives{$pkg}{$suite}{$archive}{$v}</span>]";
+				}
+
+				my @archs_to_print = grep { !$archs_printed{$_} } sort keys %{$pkgs{$pkg}{$suite}{$archive}{$v}};
+				printf "<br>%s$archive_str: %s\n",
+				$v, join (" ", @archs_to_print )
+                                    if @archs_to_print;
+				$archs_printed{$_}++ foreach @archs_to_print;
 			    }
 			    if (my $provided_by =  $provided_by{$pkg}{$suite}{$archive}) {
 				print '<br>also provided by: ',
@@ -320,21 +343,34 @@ my @pkgs = sort(keys %pkgs, keys %provided_by);
 	    my ($pkg, $archive, $suite, $section, $subsection, $priority,
 		$version) = @$_;
 	
+	    my $real_archive = '';
+	    if ($archive =~ /^(security|non-US)$/) {
+		$real_archive = $archive;
+		$archive = 'us';
+	    }
+	    if (($real_archive eq $archive) &&
+		$pkgs{$pkg}{$suite}{$archive} &&
+		(version_cmp( $pkgs{$pkg}{$suite}{$archive}, $version ) >= 0)) {
+		next;
+	    }
 	    $pkgs{$pkg}{$suite}{$archive} = $version;
 	    $subsect{$pkg}{$suite}{$archive}{source} = $subsection;
 	    $sect{$pkg}{$suite}{$archive}{source} = $section
 		unless $section eq 'main';
+	    $archives{$pkg}{$suite}{$archive}{source} = $real_archive
+		if $real_archive;
 
 	    $binaries{$pkg}{$suite}{$archive} = find_binaries( $pkg, $archive, $suite, \%src2bin );
 	}
 
 	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) {
@@ -344,6 +380,9 @@ my @pkgs = sort(keys %pkgs, keys %provided_by);
 			    if ($sect{$pkg}{$suite}{$archive}{source}) {
 				$origin_str .= " [<span style=\"color:red\">$sect{$pkg}{$suite}{$archive}{source}</span>]";
 			    }
+			    if ($archives{$pkg}{$suite}{$archive}{source}) {
+				$origin_str .= " [<span style=\"color:red\">$archives{$pkg}{$suite}{$archive}{source}</span>]";
+			    }
 			    printf( "<li><a href=\"$ROOT/%s/source/%s\">%s</a> (%s): %s   %s",
 				    $suite.(($archive ne 'us')?"/$archive":''), $pkg, $suite.(($archive ne 'us')?"/$archive":''), $subsect{$pkg}{$suite}{$archive}{source},
 				    $pkgs{$pkg}{$suite}{$archive}, $origin_str );
@@ -364,7 +403,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;