Package member key is the fully-qualified name; fix error in get

[debbugs.git] / cgi / pkgreport.cgi

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 0bde19058362e71ec8dcb869165010e83ba9995e..3e616091392bc40000d35dcf24d235a84f9a2c7e 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -37,6 +37,7 @@ BEGIN {
     # if the first directory in @INC is not an absolute directory, assume that
     # someone has overridden us via -I.
     if ($INC[0] !~ /^\//) {
+       undef $debbugs_dir;
     }
 }
 use if defined $debbugs_dir, lib => $debbugs_dir;
@@ -53,6 +54,7 @@ use Debbugs::Common qw(getparsedaddrs make_list getmaintainers getpseudodesc);
 
 use Debbugs::Bugs qw(get_bugs bug_filter newest_bug);
 use Debbugs::Packages qw(source_to_binary binary_to_source get_versions);
+use Debbugs::Collection::Bug;
 
 use Debbugs::Status qw(splitpackages);
 
@@ -93,7 +95,7 @@ our %param = cgi_parameters(query => $q,
                            single => [qw(ordering archive repeatmerged),
                                       qw(bug-rev pend-rev sev-rev),
                                       qw(maxdays mindays version),
-                                      qw(data which dist newest),
+                                      qw(data which dist),
                                       qw(noaffects),
                                      ],
                            default => $default_params,
@@ -328,8 +330,8 @@ my @bugs;
 # addusers for source and binary packages being searched for
 if (defined $config{usertag_package_domain}) {
     my @possible_packages;
-    if (exists $param{packages} and
-       defined $param{packages}
+    if (exists $param{package} and
+       defined $param{package}
        ) {
        # For binary packages, add the binary package and corresponding source package
        push @possible_packages,
@@ -349,6 +351,7 @@ if (defined $config{usertag_package_domain}) {
        push @possible_packages,
            source_to_binary(binary_only => 1,
                             source => $param{src},
+                            dist => [@{$config{distributions}}],
                             @schema_arg,
                            );
     }
@@ -372,7 +375,6 @@ while (my ($key,$value) = splice @temp, 0, 2) {
      my @entries = ();
      for my $entry (make_list($param{$key})) {
          # we'll handle newest below
-         next if $key eq 'newest';
          my $extra = '';
          if (exists $param{dist} and ($key eq 'package' or $key eq 'src')) {
               my %versions = get_versions(package => $entry,
@@ -381,6 +383,7 @@ while (my ($key,$value) = splice @temp, 0, 2) {
                                           ($key eq 'src'?(arch => q(source)):()),
                                           no_source_arch => 1,
                                           return_archs => 1,
+                                          @schema_arg,
                                          );
               my $verdesc;
               if (keys %versions > 1) {
@@ -404,15 +407,11 @@ while (my ($key,$value) = splice @temp, 0, 2) {
               push @entries, $entry.$extra;
          }
      }
-     push @title,$value.' '.join(' or ', @entries) if @entries;
-}
-if (defined $param{newest}) {
-     my $newest_bug = newest_bug();
-     @bugs = ($newest_bug - $param{newest} + 1) .. $newest_bug;
-     push @title, 'in '.@bugs.' newest reports';
-     $param{bugs} = [exists $param{bugs}?make_list($param{bugs}):(),
-                    @bugs,
-                   ];
+     if ($key eq 'newest') {
+        push @title, 'in '.join(' or ',@entries).' newest reports';
+     } else {
+        push @title,$value.' '.join(' or ', @entries) if @entries;
+     }
 }
 
 my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title);
@@ -420,7 +419,6 @@ my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title);
 
 #yeah for magick!
 @bugs = get_bugs((map {exists $param{$_}?($_,$param{$_}):()}
-                 grep {$_ ne 'newest'}
                  keys %package_search_keys, 'archive'),
                 usertags => \%ut,
                 @schema_arg,
@@ -468,7 +466,14 @@ my %bugs;
 @bugs{@bugs} = @bugs;
 @bugs = keys %bugs;
 
-my $result = pkg_htmlizebugs(bugs => \@bugs,
+my $bugs = Debbugs::Collection::Bug->
+    new(bugs => \@bugs,
+       @schema_arg,
+       );
+
+$bugs->load_related_packages_and_versions();
+
+my $result = pkg_htmlizebugs(bugs => $bugs,
                             names => \@names,
                             title => \@title,
                             order => \@order,