X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fpkgreport.cgi;h=c07bf78a1b8eb7256544de604345d75ea668e2b7;hb=b916194da089d631869cf605c31261cbb7662dc4;hp=062aef8113577a6aee988317763cb4a6aeb42dd4;hpb=4df037ee08661c9b102751e2c5580eb2184256a1;p=debbugs.git

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 062aef8..c07bf78 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -201,15 +201,16 @@ for my $user (map {split /[\s*,\s*]+/} make_list($param{users}||[])) {
 }
 
 if (defined $param{usertag}) {
-    my %select_ut = ();
-    my ($u, $t) = split /:/, $param{usertag}, 2;
-    Debbugs::User::read_usertags(\%select_ut, $u);
-    unless (defined $t && $t ne "") {
-        $t = join(",", keys(%select_ut));
-    }
-
-    add_user($u);
-    push @{$param{tag}}, split /,/, $t;
+     for my $usertag (make_list($param{usertag})) {
+	  my %select_ut = ();
+	  my ($u, $t) = split /:/, $usertag, 2;
+	  Debbugs::User::read_usertags(\%select_ut, $u);
+	  unless (defined $t && $t ne "") {
+	       $t = join(",", keys(%select_ut));
+	  }
+	  add_user($u);
+	  push @{$param{tag}}, split /,/, $t;
+     }
 }
 
 my $Archived = $archive ? " Archived" : "";
@@ -303,14 +304,27 @@ while (my ($key,$value) = splice @search_key_order, 0, 2) {
      for my $entry (make_list($param{$key})) {
 	  my $extra = '';
 	  if (exists $param{dist} and ($key eq 'package' or $key eq 'src')) {
-	       my @versions = get_versions(package => $entry,
+	       my %versions = get_versions(package => $entry,
 					   (exists $param{dist}?(dist => $param{dist}):()),
-					   (exists $param{arch}?(arch => $param{arch}):()),
+					   (exists $param{arch}?(arch => $param{arch}):(arch => $config{default_architectures})),
 					   ($key eq 'src'?(arch => q(source)):()),
+					   no_source_arch => 1,
+					   return_archs => 1,
 					  );
-	       my $verdesc = join(', ',@versions);
-	       $verdesc = 'version'.(@versions>1?'s ':' ').$verdesc;
-	       $extra= " ($verdesc)" if @versions;
+	       my $verdesc;
+	       if (keys %versions > 1) {
+		    $verdesc = 'versions '. join(', ',
+				    map { $_ .' ['.join(', ',
+						    sort @{$versions{$_}}
+						   ).']';
+				   } keys %versions);
+	       }
+	       else {
+		    $verdesc = 'version '.join(', ',
+					       keys %versions
+					      );
+	       }
+	       $extra= " ($verdesc)" if keys %versions;
 	  }
 	  push @entries, $entry.$extra;
      }
@@ -397,9 +411,17 @@ for my $package (make_list($param{src}||[])) {
 
 sub output_package_info{
     my ($srcorbin,$package) = @_;
+
+    my %pkgsrc = %{getpkgsrc()};
+    my $srcforpkg = $package;
+    if ($srcorbin eq 'binary') {
+	 $srcforpkg = $pkgsrc{$package};
+	 defined $srcforpkg or $srcforpkg = $package;
+    }
+
     my $showpkg = html_escape($package);
     my $maintainers = getmaintainers();
-    my $maint = $maintainers->{$package};
+    my $maint = $maintainers->{$srcforpkg};
     if (defined $maint) {
 	 print '<p>';
 	 print htmlize_maintlinks(sub { $_[0] == 1 ? "Maintainer for $showpkg is "
@@ -410,12 +432,6 @@ sub output_package_info{
     } else {
 	 print "<p>No maintainer for $showpkg. Please do not report new bugs against this package.</p>\n";
     }
-    my %pkgsrc = %{getpkgsrc()};
-    my $srcforpkg = $package;
-    if ($srcorbin eq 'binary') {
-	 $srcforpkg = $pkgsrc{$package};
-	 defined $srcforpkg or $srcforpkg = $package;
-    }
     my @pkgs = getsrcpkgs($srcforpkg);
     @pkgs = grep( !/^\Q$package\E$/, @pkgs );
     if ( @pkgs ) {
@@ -441,7 +457,7 @@ sub output_package_info{
 	 }
 	 if (defined $gSubscriptionDomain) {
 	      my $ptslink = $package ? $srcforpkg : $src;
-	      push @references, "to the <a href=\"http://$gSubscriptionDomain/$ptslink\">Package Tracking System</a>";
+	      push @references, q(to the <a href="http://).html_escape("$gSubscriptionDomain/$ptslink").q(">Package Tracking System</a>);
 	 }
 	 # Only output this if the source listing is non-trivial.
 	 if ($srcorbin eq 'binary' and $srcforpkg) {
@@ -519,12 +535,12 @@ print "    <td><input id=\"b_1_2\" name=vt value=bysuite type=radio onchange=\"e
 
 if (defined $pkg) {
     my $v = html_escape($version) || "";
-    my $pkgsane = html_escape($pkg);
+    my $pkgsane = html_escape($pkg->[0]);
     print "<tr><td></td>";
     print "    <td><input id=\"b_1_3\" name=vt value=bypkg type=radio onchange=\"enable(1);\" $checked_ver>$pkgsane version <input id=\"b_1_3_1\" name=version value=\"$v\"></td></tr>\n";
 } elsif (defined $src) {
     my $v = html_escape($version) || "";
-    my $srcsane = html_escape($src);
+    my $srcsane = html_escape($src->[0]);
     print "<tr><td></td>";
     print "    <td><input name=vt value=bysrc type=radio onchange=\"enable(1);\" $checked_ver>$srcsane version <input id=\"b_1_3_1\" name=version value=\"$v\"></td></tr>\n";
 }
@@ -750,13 +766,19 @@ sub pkg_htmlizebugs {
     for my $include (make_list($param{include})) {
 	 next unless defined $include;
 	 my ($key,$value) = split /\s*:\s*/,$include,2;
-	 next unless defined $value;
+	 unless (defined $value) {
+	     $key = 'tags';
+	     $value = $include;
+	 }
 	 push @{$include{$key}}, split /\s*,\s*/, $value;
     }
     for my $exclude (make_list($param{exclude})) {
 	 next unless defined $exclude;
 	 my ($key,$value) = split /\s*:\s*/,$exclude,2;
-	 next unless defined $value;
+	 unless (defined $value) {
+	     $key = 'tags';
+	     $value = $exclude;
+	 }
 	 push @{$exclude{$key}}, split /\s*,\s*/, $value;
     }
 
@@ -765,7 +787,7 @@ sub pkg_htmlizebugs {
 				      (exists $param{dist}?(dist => $param{dist}):()),
 				      bugusertags => \%bugusertags,
 				      (exists $param{version}?(version => $param{version}):()),
-				      (exists $param{arch}?(arch => $param{arch}):()),
+				      (exists $param{arch}?(arch => $param{arch}):(arch => $config{default_architectures})),
 				     )};
         next unless %status;
         next if bug_filter(bug => $bug,
@@ -1096,9 +1118,9 @@ sub determine_ordering {
 
 	    ($h->{"nam"}) = make_list($param{"nam$i"})
                 if (defined $param{"nam$i"});
-            $h->{"ord"} = [ split /\s*,\s*/, make_list($param{"ord$i"}) ]
+            $h->{"ord"} = [ map {split /\s*,\s*/} make_list($param{"ord$i"}) ]
                 if (defined $param{"ord$i"});
-            $h->{"ttl"} = [ split /\s*,\s*/, make_list($param{"ttl$i"}) ]
+	    $h->{"ttl"} = [ map {split /\s*,\s*/} make_list($param{"ttl$i"}) ]
                 if (defined $param{"ttl$i"});
 
             push @c, $h;