[project @ 2005-07-17 16:06:26 by cjwatson]

[debbugs.git] / cgi / pkgreport.cgi

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 0f5115a8bca387c4c32bfe1b9471cb8039266027..74bf6065eab61dff3f0b4cc9ef4e073bc5db3a7a 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -125,8 +125,8 @@ if (defined $pkg) {
     $title .= " (version $version)";
   } elsif (defined $dist) {
     $title .= " in $dist";
-    my $distver = getversion($pkg, $dist, $arch);
-    $title .= " (version $distver)" if defined $distver;
+    my $verdesc = getversiondesc($pkg);
+    $title .= " ($verdesc)" if defined $verdesc;
   }
   my @pkgs = split /,/, $pkg;
   @bugs = @{getbugs(sub {my %d=@_;
@@ -137,12 +137,13 @@ if (defined $pkg) {
                         }, 'package', @pkgs)};
 } elsif (defined $src) {
   $title = "source $src";
+  set_option('arch', 'source');
   if (defined $version) {
     $title .= " (version $version)";
   } elsif (defined $dist) {
     $title .= " in $dist";
-    my $distver = getversion($src, $dist, 'source');
-    $title .= " (version $distver)" if defined $distver;
+    my $verdesc = getversiondesc($src);
+    $title .= " ($verdesc)" if defined $verdesc;
   }
   my @pkgs = ();
   my @srcs = split /,/, $src;
@@ -201,11 +202,12 @@ if (defined $pkg) {
   $title = "submitter $submitter";
   $title .= " in $dist" if defined $dist;
   my @submitters = split /,/, $submitter;
-  @bugs = @{getbugs(sub {my %d=@_; my $se; 
-                      ($se = $d{"submitter"} || "") =~ s/\s*\(.*\)\s*//;
-                      $se = $1 if ($se =~ m/<(.*)>/);
-                      return 1 if grep($se eq $_, @submitters);
-                    }, 'submitter-email', @submitters)};
+  @bugs = @{getbugs(sub {my %d=@_;
+                         my @se = getparsedaddrs($d{"submitter"} || "");
+                         foreach my $try (@submitters) {
+                           return 1 if grep { $_->address eq $try } @se;
+                         }
+                        }, 'submitter-email', @submitters)};
 } elsif (defined($severity) && defined($status)) {
   $title = "$status $severity bugs";
   $title .= " in $dist" if defined $dist;