Always set $opts{searchon_form}

[deb/packages.git] / cgi-bin / search_packages.pl

diff --git a/cgi-bin/search_packages.pl b/cgi-bin/search_packages.pl
index 516d36d522adee913399ca1e91e43086bb5373e5..a7184dc7d5050a4c6a61365536672fdd6f343d27 100755 (executable)
--- a/cgi-bin/search_packages.pl
+++ b/cgi-bin/search_packages.pl
@@ -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);
+    my (%pkgs, %subsect, %sect, %archives, %desc, %binaries, %provided_by);
 
     unless ($opts{searchon} eq 'sourcenames') {
        foreach (@results) {
@@ -260,40 +263,75 @@ if (@results) {
                $priority, $version, $desc) = @$_;
        
            my ($pkg) = $pkg_t =~ m/^(.+)/; # untaint
-           $pkgs{$pkg}{$suite}{$archive}{$version}{$arch} = 1;
-           $subsect{$pkg}{$suite}{$archive}{$version} = $subsection;
-           $sect{$pkg}{$suite}{$archive}{$version} = $section
-               unless $section eq 'main';
-           
-           $desc{$pkg}{$suite}{$archive}{$version} = $desc;
+           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 {
+               $provided_by{$pkg}{$suite}{$archive} = [ split /\s+/, $desc ];
+           }
        }
 
+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 @pkgs, \%opts );
+           print "<p>Found <em>".(scalar @pkgs)."</em> matching packages,";
+           #my $count = 0;
        
-           foreach my $pkg (sort keys %pkgs) {
-               $count++;
-               next if $count < $start or $count > $end;
+           foreach my $pkg (@pkgs) {
+               #$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",
-                           $suite.(($archive ne 'us')?"/$archive":''), $pkg, $suite.(($archive ne 'us')?"/$archive":''), $subsect{$pkg}{$suite}{$archive}{$versions[0]},
+                           $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: ',
+                               join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$provided_by);
                            }
                            print "</li>\n";
+                       } elsif (my $provided_by =  $provided_by{$pkg}{$suite}{$archive}) {
+                           printf "<li><a href=\"$ROOT/%s/%s\">%s</a>: Virtual package<br>",
+                           $path, $pkg, $path;
+                           print 'provided by: ',
+                           join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$provided_by);
                        }
                    }
                }
@@ -305,21 +343,34 @@ if (@results) {
            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) {
@@ -329,6 +380,9 @@ if (@results) {
                            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 );
@@ -349,7 +403,7 @@ if (@results) {
            }
        }
     }
-    printindexline( $input, scalar keys %pkgs, \%opts );
+    #printindexline( $input, scalar keys %pkgs, \%opts );
 }
 #print_results(\@results, \%opts) if @results;;
 my $tet1 = new Benchmark;