X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fpkgreport.cgi;h=3855928e042a941d388bf74bbd9b4045c912ca18;hb=b1252b6797aa6a79d00a32165fb2fa8fb1bd9318;hp=0bde19058362e71ec8dcb869165010e83ba9995e;hpb=038d80fef24f5ba18f5b8d8dbe5cd6a9bf876910;p=debbugs.git

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 0bde190..3855928 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -wT
+#!/usr/bin/perl -T
 # This script is part of debbugs, and is released
 # under the terms of the GPL version 2, or any later
 # version at your option.
@@ -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,
@@ -292,8 +294,10 @@ my %bugusertags;
 my %ut;
 my %seen_users;
 
+my @users;
 for my $user (map {split /[\s*,\s*]+/} make_list($param{users}||[])) {
     next unless length($user);
+    push @users, $user;
     add_user($user,\%ut,\%bugusertags,\%seen_users,\%cats,\%hidden);
 }
 
@@ -304,7 +308,8 @@ if (defined $param{usertag}) {
 	  Debbugs::User::read_usertags(\%select_ut, $u);
 	  unless (defined $t && $t ne "") {
 	       $t = join(",", keys(%select_ut));
-	  }
+	   }
+	  push @users,$u;
 	  add_user($u,\%ut,\%bugusertags,\%seen_users,\%cats,\%hidden);
 	  push @{$param{tag}}, split /,/, $t;
      }
@@ -328,8 +333,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,11 +354,14 @@ if (defined $config{usertag_package_domain}) {
 	push @possible_packages,
 	    source_to_binary(binary_only => 1,
 			     source => $param{src},
+			     dist => [@{$config{distributions}}],
 			     @schema_arg,
 			    );
     }
     for my $package (@possible_packages) {
 	next unless defined $package and length $package;
+	push @users,
+	    $package.'@'.$config{usertag_package_domain};
 	add_user($package.'@'.$config{usertag_package_domain},
 		 \%ut,\%bugusertags,\%seen_users,\%cats,\%hidden);
     }
@@ -372,7 +380,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 +388,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 +412,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 +424,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 +471,17 @@ my %bugs;
 @bugs{@bugs} = @bugs;
 @bugs = keys %bugs;
 
-my $result = pkg_htmlizebugs(bugs => \@bugs,
+my $bugs = Debbugs::Collection::Bug->
+    new(bugs => \@bugs,
+	@schema_arg,
+	users => [map {my $u = Debbugs::User->new($_);
+		       $u->has_bug_tags()?($u):()
+		   } @users],
+       );
+
+$bugs->load_related_packages_and_versions();
+
+my $result = pkg_htmlizebugs(bugs => $bugs,
 			     names => \@names,
 			     title => \@title,
 			     order => \@order,