[project @ 2005-08-11 08:48:09 by ajt]

[debbugs.git] / cgi / pkgreport.cgi

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 1955c4fd2d4d4b17f54e0e3edc6e40c370880be5..1f80561e8aec2cbca7e753eb4e9a4e5f5b3826f5 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -114,6 +114,7 @@ set_option("sev-inc", $sev_inc);
 set_option("version", $version);
 set_option("dist", $dist);
 set_option("arch", $arch);
+set_option("use-bug-idx", defined($param{'use-bug-idx'}) ? $param{'use-bug-idx'} : 0);
 set_option("show_list_header", $show_list_header);
 set_option("show_list_footer", $show_list_footer);
 
@@ -125,8 +126,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 +138,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 +203,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;
@@ -248,16 +251,18 @@ print "<H1>" . "$debbugs::gProject$Archived $debbugs::gBug report logs: $title"
 my $showresult = 1;
 
 if (defined $pkg || defined $src) {
+    my $showpkg = (defined $pkg) ? $pkg : "source package $src";
     my %maintainers = %{getmaintainers()};
     my $maint = $pkg ? $maintainers{$pkg} : $maintainers{$src} ? $maintainers{$src} : undef;
     if (defined $maint) {
         print '<p>';
-        my $showpkg = (defined $pkg) ? $pkg : "source package $src";
         print htmlmaintlinks(sub { $_[0] == 1 ? "Maintainer for $showpkg is "
                                               : "Maintainers for $showpkg are "
                                  },
                              $maint);
         print ".</p>\n";
+    } else {
+        print "<p>No maintainer for $showpkg. Please do not report new bugs against this package.</p>\n";
     }
     if (defined $maint or @bugs) {
        my %pkgsrc = %{getpkgsrc()};
@@ -297,6 +302,11 @@ if (defined $pkg || defined $src) {
                push @references, sprintf "to the source package <a href=\"%s\">%s</a>'s bug page", srcurl($srcforpkg), htmlsanit($srcforpkg);
            }
        }
+       if ($pkg) {
+           set_option("archive", !$archive);
+           push @references, sprintf "to the <a href=\"%s\">%s reports for %s</a>", pkgurl($pkg), ($archive ? "active" : "archived"), htmlsanit($pkg);
+           set_option("archive", $archive);
+       }
        if (@references) {
            $references[$#references] = "or $references[$#references]" if @references > 1;
            print "<p>You might like to refer ", join(", ", @references), ".</p>\n";