From a6486e4bd1f9a236dfcf312008030104991fe999 Mon Sep 17 00:00:00 2001
From: ajt <>
Date: Mon, 2 Oct 2000 00:50:35 -0800
Subject: [PATCH] [project @ 2000-10-02 01:50:35 by ajt] Use the CGI scripts
 for maintainer URLs Find maintainers based on the Maintainers file and the
 package name, not   direct from the index file

---
 cgi/common.pl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cgi/common.pl b/cgi/common.pl
index 7a27c371..3988d5b5 100644
--- a/cgi/common.pl
+++ b/cgi/common.pl
@@ -97,8 +97,10 @@ sub htmlindexentrystatus {
 
 sub mainturl {
     my $ref = shift;
-    return sprintf "http://%s/db/ma/l%s.html",
-	$debbugs::gWebDomain, maintencoded($ref);
+    my $params = "maintenc=" . maintencoded($ref);
+    $params .= "&archive=yes" if ($common_archive);
+    $params .= "&repeatmerged=yes" if ($common_repeatmerged);
+    return $debbugs::gCGIDomain . "pkgreport.cgi" . "?" . $params;
 }
 
 sub pkgurl {
@@ -197,9 +199,10 @@ sub htmlizebugs {
 
 sub maintbugs {
     my $maint = shift;
+    my %maintainers = getmaintainers();
     my $chk = sub {
         my %d = @_;
-        ($maintemail = $d{"maint"}) =~ s/\s*\(.*\)\s*//;
+        ($maintemail = $maintainers{$d{"pkg"}}) =~ s/\s*\(.*\)\s*//;
         if ($maintemail =~ m/<(.*)>/) { $maintemail = $1 }
         return $maintemail eq $maint;
     };
@@ -208,7 +211,8 @@ sub maintbugs {
 
 sub maintencbugs {
     my $maint = shift;
-    return getbugs(sub {my %d=@_; return maintencoded($d{"maint"}) eq $maint});
+    my %maintainers = getmaintainers();
+    return getbugs(sub {my %d=@_; return maintencoded($maintainers{$d{"pkg"}}) eq $maint});
 }
 
 sub pkgbugs {
-- 
2.39.5