* Finish deprecating quit in Debbugs::Status

[debbugs.git] / cgi / pkgreport.cgi

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 78b4dc20fa8c0d1a31edaf91ac25f7639b856ce5..8736e8c0570a1305c91193d167adf9ba857104d5 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -304,15 +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;
      }
@@ -559,7 +571,6 @@ print <<EOF;
 
 <tr><td>&nbsp;</td></tr>
 
-</td></tr>
 <tr><td>Merged bugs should be</td><td>
 <select name=repeatmerged>
 <option value=yes$sel_rmy>displayed separately</option>
@@ -643,16 +654,15 @@ sub pkg_htmlindexentrystatus {
         $showversions .= join ', ', map {s{/}{ }; html_escape($_)} @fixed;
     }
     $result .= ' (<a href="'.
-        version_url($status{package},
-                    $status{found_versions},
-                    $status{fixed_versions},
+        version_url(package => $status{package},
+                    found   => $status{found_versions},
+                    fixed   => $status{fixed_versions},
                    ).qq{">$showversions</a>)} if length $showversions;
     $result .= ";\n";
 
     $result .= $showseverity;
-    $result .= pkg_htmladdresslinks("Reported by: ", \&submitterurl,
-                                $status{originator});
-    $result .= ";\nOwned by: " . html_escape($status{owner})
+    $result .= "Reported by: ".package_links(submitter=>$status{originator});
+    $result .= ";\nOwned by: " . package_links(owner => $status{owner})
                if length $status{owner};
     $result .= ";\nTags: <strong>" 
                  . html_escape(join(", ", sort(split(/\s+/, $status{tags}))))
@@ -685,7 +695,7 @@ sub pkg_htmlindexentrystatus {
             $result .= ";\n<strong>Forwarded</strong> to "
                        . join(', ',
                              map {maybelink($_)}
-                             split /[,\s]+/,$status{forwarded}
+                             split /\,\s+/,$status{forwarded}
                             );
         }
        # Check the age of the logfile
@@ -775,7 +785,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,
@@ -813,7 +823,7 @@ sub pkg_htmlizebugs {
     if ($ordering eq "raw") {
         $result .= "<UL class=\"bugs\">\n" . join("", map( { $_->[ 2 ] } @status ) ) . "</UL>\n";
     } else {
-        $header .= "<ul>\n<div class=\"msgreceived\">\n";
+        $header .= "<div class=\"msgreceived\">\n<ul>\n";
        my @keys_in_order = ("");
        for my $o (@order) {
            push @keys_in_order, "X";
@@ -854,7 +864,7 @@ sub pkg_htmlizebugs {
         } 
         $header .= "</ul></div>\n";
 
-        $footer .= "<ul>\n<div class=\"msgreceived\">";
+        $footer .= "<div class=\"msgreceived\">\n<ul>\n";
         for my $i (0..$#prior) {
             my $local_result = '';
             foreach my $key ( @{$order[$i]} ) {
@@ -866,7 +876,7 @@ sub pkg_htmlizebugs {
                 $footer .= "<li>$names[$i]<ul>\n$local_result</ul></li>\n";
             }
         }
-        $footer .= "</div></ul>\n";
+        $footer .= "</ul>\n</div>\n";
     }
 
     $result = $header . $result if ( $common{show_list_header} );
@@ -893,10 +903,6 @@ sub pkg_htmlpackagelinks {
            );
 }
 
-sub pkg_htmladdresslinks {
-     htmlize_addresslinks(@_,'submitter');
-}
-
 sub pkg_javascript {
     return <<EOF ;
 <script type="text/javascript">
@@ -1019,7 +1025,7 @@ sub pkg_htmlselectarch {
 sub myurl {
      return html_escape(pkg_url(map {exists $param{$_}?($_,$param{$_}):()}
                             qw(archive repeatmerged mindays maxdays),
-                            qw(version dist arch pkg src tag maint submitter)
+                            qw(version dist arch package src tag maint submitter)
                            )
                    );
 }