X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fpkgreport.cgi;h=eb8e54f7f8ee1acd21a973813614a83b1b259034;hb=509dc1d30d2083164bf434e52348065b03fa8787;hp=2efed0e6dc43497761d64bff8692a3972c84b872;hpb=a62b19a9ba39ce1b719a47627853042fce3b3941;p=debbugs.git

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 2efed0e..eb8e54f 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,9 +37,13 @@ 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;
+    }
+    if (defined $debbugs_dir) {
+	unshift @INC, $debbugs_dir.'/lib/';
     }
 }
-use if defined $debbugs_dir, lib => $debbugs_dir;
+
 
 binmode(STDOUT,':encoding(UTF-8)');
 use POSIX qw(strftime nice);
@@ -52,7 +56,8 @@ use Debbugs::User;
 use Debbugs::Common qw(getparsedaddrs make_list getmaintainers getpseudodesc);
 
 use Debbugs::Bugs qw(get_bugs bug_filter newest_bug);
-use Debbugs::Packages qw(getsrcpkgs getpkgsrc get_versions);
+use Debbugs::Packages qw(source_to_binary binary_to_source get_versions);
+use Debbugs::Collection::Bug;
 
 use Debbugs::Status qw(splitpackages);
 
@@ -65,9 +70,11 @@ use Debbugs::Text qw(:templates);
 use Debbugs::DB;
 
 my $s;
+my @schema_arg = ();
 if (defined $config{database}) {
     $s = Debbugs::DB->connect($config{database}) or
         die "Unable to connect to DB";
+    @schema_arg = ('schema',$s);
 }
 
 use CGI::Simple;
@@ -91,7 +98,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,
@@ -290,8 +297,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);
 }
 
@@ -302,7 +311,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;
      }
@@ -324,28 +334,42 @@ my %strings = ();
 my @bugs;
 
 # addusers for source and binary packages being searched for
-my $pkgsrc = getpkgsrc();
-my $srcpkg = getsrcpkgs();
-for my $package (# For binary packages, add the binary package
-		 # and corresponding source package
-		 make_list($param{package}||[]),
-		 (map {defined $pkgsrc->{$_}?($pkgsrc->{$_}):()}
-		  make_list($param{package}||[]),
-		 ),
-		 # For source packages, add the source package
-		 # and corresponding binary packages
-		 make_list($param{src}||[]),
-		 (map {defined $srcpkg->{$_}?($srcpkg->{$_}):()}
-		  make_list($param{src}||[]),
-		 ),
-		) {
-     next unless defined $package;
-     add_user($package.'@'.$config{usertag_package_domain},
-	      \%ut,\%bugusertags,\%seen_users,\%cats,\%hidden)
-	  if defined $config{usertag_package_domain};
+if (defined $config{usertag_package_domain}) {
+    my @possible_packages;
+    if (exists $param{package} and
+	defined $param{package}
+       ) {
+	# For binary packages, add the binary package and corresponding source package
+	push @possible_packages,
+	    make_list($param{package});
+	push @possible_packages,
+	    binary_to_source(source_only => 1,
+			     binary=>$param{package},
+			     @schema_arg,
+			    );
+    }
+    if (exists $param{src} and
+	defined $param{src}
+       ) {
+	# For source packages, add the source package and corresponding binary packages
+	push @possible_packages,
+	    make_list($param{src});
+	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);
+    }
 }
 
-
 # walk through the keys and make the right get_bugs query.
 
 my $form_option_variables = {};
@@ -359,7 +383,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,
@@ -368,6 +391,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) {
@@ -391,15 +415,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);
@@ -407,10 +427,9 @@ 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,
-		 defined $s?(schema => $s):(),
+		 @schema_arg,
 		);
 
 # shove in bugs which affect this package if there is a package or a
@@ -424,7 +443,7 @@ if (not exists $param{affects} and not exists $param{noaffects} and
 			  grep {$_ ne 'newest'}
 			  keys %package_search_keys, 'archive'),
 			 usertags => \%ut,
-                         defined $s?(schema => $s):(),
+			 @schema_arg,
 			);
 }
 
@@ -455,7 +474,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,
@@ -469,7 +498,7 @@ my $result = pkg_htmlizebugs(bugs => \@bugs,
 			     exclude => $exclude,
 			     this => $this,
 			     options => \%param,
-                             defined $s?(schema => $s):(),
+                             @schema_arg,
 			     (exists $param{dist})?(dist    => $param{dist}):(),
 			    );
 
@@ -504,6 +533,7 @@ for my $package (make_list($param{package}||[])) {
 				 package => $package,
 				 options => \%param,
 				 bugs    => \@bugs,
+				 @schema_arg,
 				);
 }
 for my $package (make_list($param{src}||[])) {
@@ -511,6 +541,7 @@ for my $package (make_list($param{src}||[])) {
 				 package => $package,
 				 options => \%param,
 				 bugs    => \@bugs,
+				 @schema_arg,
 				);
 }