[project @ 2000-11-17 11:46:07 by ajt]

random  bug fixes

diff --git a/cgi/common.pl b/cgi/common.pl
index ae8cc172034fc3218fcacac9f46a001d92e809af..d67d7af78607896edbae6c17c0039608e799d8e9 100644 (file)
--- a/cgi/common.pl
+++ b/cgi/common.pl
@@ -124,7 +124,7 @@ sub htmlindexentrystatus {
 }
 
 sub submitterurl {
-    my $ref = shift;
+    my $ref = shift || "";
     my $params = "submitter=" . emailfromrfc822($ref);
     $params .= "&archive=yes" if ($common_archive);
     $params .= "&repeatmerged=yes" if ($common_repeatmerged);
@@ -132,7 +132,7 @@ sub submitterurl {
 }
 
 sub mainturl {
-    my $ref = shift;
+    my $ref = shift || "";
     my $params = "maint=" . emailfromrfc822($ref);
     $params .= "&archive=yes" if ($common_archive);
     $params .= "&repeatmerged=yes" if ($common_repeatmerged);
@@ -150,7 +150,7 @@ sub pkgurl {
 
 sub htmlsanit {
     my %saniarray = ('<','lt', '>','gt', '&','amp', '"','quot');
-    my $in = shift;
+    my $in = shift || "";
     my $out;
     while ($in =~ m/[<>&"]/) {
         $out .= $`. '&'. $saniarray{$&}. ';';

diff --git a/cgi/pkgindex.cgi b/cgi/pkgindex.cgi
index 74ec98a73ab35300a2ecb35e6aca11ba95f7b583..24fea17b577d7343f7eb5a7411c99ab0efe8fc35 100755 (executable)
--- a/cgi/pkgindex.cgi
+++ b/cgi/pkgindex.cgi
@@ -49,21 +49,22 @@ set_option("archive", $archive);
 my %count;
 my $tag;
 my $note;
-my $linksub;
+my %htmldescrip = ();
+my %sortkey = ();
 if ($indexon eq "pkg") {
   $tag = "package";
   %count = countbugs(sub {my %d=@_; return $d{"pkg"}});
   $note = "<p>Note that with multi-binary packages there may be other\n";
   $note .= "reports filed under the different binary package names.</p>\n";
-  $linksub = sub {
-                   my $pkg = shift; 
-                   sprintf('<a href="%s">%s</a> ' 
-                            . '(maintained by <a href="%s">%s</a>',
+  foreach my $pkg (keys %count) {
+    $sortkey{$pkg} = lc $pkg;
+    $htmldescrip{$pkg} = sprintf('<a href="%s">%s</a> ' 
+                           . '(maintainer: <a href="%s">%s</a>)',
                            pkgurl($pkg),
                            htmlsanit($pkg),
                            mainturl($maintainers{$pkg}),
-                          htmlsanit($maintainers{$pkg}));
-                  };
+                          htmlsanit($maintainers{$pkg} || "(unknown)"));
+  }
 } elsif ($indexon eq "maint") {
   $tag = "maintainer";
   %count = countbugs(sub {my %d=@_; 
@@ -72,17 +73,17 @@ if ($indexon eq "pkg") {
   $note = "<p>Note that maintainers may use different Maintainer fields for\n";
   $note .= "different packages, so there may be other reports filed under\n";
   $note .= "different addresses.</p>\n";
-  $linksub = sub {
-                   my $maint = shift; my $maintfull = $maint;
-                  foreach my $x (values %maintainers) {
-                       if (emailfromrfc822($x) eq $maint) {
-                         $maintfull = $x; last;
-                      }
-                   }
-                   sprintf('<a href="%s">%s</a>',
+  my %email2maint = ();
+  for my $x (values %maintainers) {
+    my $y = emailfromrfc822($x);
+    $email2maint{$y} = $x unless (defined $email2maint{$y});
+  }
+  foreach my $maint (keys %count) {
+    $sortkey{$maint} = lc $email2maint{$maint} || "(unknown)";
+    $htmldescrip{$maint} = sprintf('<a href="%s">%s</a>',
                            mainturl($maint),
-                          htmlsanit($maintfull));
-                  };
+                          htmlsanit($email2maint{$maint}) || "(unknown)")
+  }
 } elsif ($indexon eq "submitter") {
   $tag = "submitter";
   my %fullname = ();
@@ -91,20 +92,20 @@ if ($indexon eq "pkg") {
                           $fullname{$em} = $f if (!defined $fullname{$em});
                          return $em;
                        });
-  $linksub = sub {
-                   my $sub = shift;
-                   sprintf('<a href="%s">%s</a>',
+  foreach my $sub (keys %count) {
+    $sortkey{$sub} = lc $fullname{$sub};
+    $htmldescrip{$sub} = sprintf('<a href="%s">%s</a>',
                            submitterurl($sub),
                           htmlsanit($fullname{$sub}));
-                  };
+  }
   $note = "<p>Note that people may use different email accounts for\n";
   $note .= "different bugs, so there may be other reports filed under\n";
   $note .= "different addresses.</p>\n";
 }
 
 my $result = "<ul>\n";
-foreach my $x (sort keys %count) {
-  $result .= "<li>" . $linksub->($x) . " has $count{$x} bugs</li>\n";
+foreach my $x (sort { $sortkey{$a} cmp $sortkey{$b} } keys %count) {
+  $result .= "<li>" . $htmldescrip{$x} . " has $count{$x} bugs</li>\n";
 }
 $result .= "</ul>\n";
 
@@ -115,7 +116,7 @@ print "<HTML><HEAD><TITLE>\n" .
     "</TITLE></HEAD>\n" .
     '<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#800080">' .
     "\n";
-print "<H1>" . "$debbugs::gProject $Archived $debbugs::gBug report logs: $tag" .
+print "<H1>" . "$debbugs::gProject $Archived $debbugs::gBug report logs by $tag" .
       "</H1>\n";
 
 print $note;