X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fpkgindex.cgi;h=a43428a6cd7f6362433a1c3ace25a6b2b04b3b07;hb=235a779bdb026b6357e95053e1d7faaab87e8931;hp=292c23740008efd4eca5a7802a0f20a5cb84e593;hpb=9266553e47f8ce3bf129fcb395ff34cb9313ed14;p=debbugs.git

diff --git a/cgi/pkgindex.cgi b/cgi/pkgindex.cgi
index 292c237..a43428a 100755
--- a/cgi/pkgindex.cgi
+++ b/cgi/pkgindex.cgi
@@ -1,105 +1,241 @@
 #!/usr/bin/perl -wT
 
-package debbugs;
-
+use warnings;
 use strict;
-use POSIX qw(strftime tzset nice);
-
-#require '/usr/lib/debbugs/errorlib';
-#require '/usr/lib/debbugs/common.pl';
-require '/debian/home/ajt/newajbug/common.pl';
+use POSIX qw(strftime nice);
 
-require '/etc/debbugs/config';
-require '/etc/debbugs/text';
+use Debbugs::Config qw(:globals :text :config);
+use CGI::Simple;
+use Debbugs::CGI qw(:util :url :html);
+use Debbugs::Common qw(getmaintainers getparsedaddrs);
+use Debbugs::Bugs qw(count_bugs);
+use Debbugs::Status qw(:status);
+use Debbugs::Packages qw(getpkgsrc);
+use Debbugs::Text qw(:templates);
 
 nice(5);
 
-my %param = readparse();
+my $q = new CGI::Simple;
+my %param = cgi_parameters(query   => $q,
+			   single  => [qw(indexon repeatmerged archive sortby),
+				       qw(skip max_results first),
+				      ],
+			   default => {indexon      => 'pkg',
+				       repeatmerged => 'yes',
+				       archive      => 'no',
+				       sortby       => 'alpha',
+				       skip         => 0,
+				       max_results  => 100,
+				      },
+			  );
+
+if (defined $param{first}) {
+     # rip out all non-words from first
+     $param{first} =~ s/\W//g;
+}
+if (defined $param{next}) {
+     $param{skip}+=$param{max_results};
+}
+elsif (defined $param{prev}) {
+     $param{skip}-=$param{max_results};
+     $param{skip} = 0 if $param{skip} < 0;
+}
 
-my $indexon = $param{'indexon'} || 'pkg';
-if ($indexon !~ m/^(pkg|maint|submitter)/) {
-    quit("You have to choose something to index on");
+my $indexon = $param{indexon};
+if ($param{indexon} !~ m/^(pkg|src|maint|submitter|tag)$/) {
+    quitcgi("You have to choose something to index on", '400 Bad Request');
 }
 
-my $repeatmerged = ($param{'repeatmerged'} || "yes") eq "yes";
-my $archive = ($param{'archive'} || "no") eq "yes";
-#my $include = $param{'include'} || "";
-#my $exclude = $param{'exclude'} || "";
+my $repeatmerged = $param{repeatmerged} eq 'yes';
+my $archive = $param{archive} eq "yes";
+my $sortby = $param{sortby};
+if ($sortby !~ m/^(alpha|count)$/) {
+    quitcgi("Don't know how to sort like that", '400 Bad Request');
+}
 
-my $Archived = $archive ? "Archived" : "";
+my $Archived = $archive ? " Archived" : "";
 
-my %maintainers = &getmaintainers();
+my %maintainers = %{&getmaintainers()};
 my %strings = ();
 
-$ENV{"TZ"} = 'UTC';
-tzset();
-
-my $dtime = strftime "%a, %e %b %Y %T UTC", localtime;
-my $tail_html = $debbugs::gHTMLTail;
-$tail_html = $debbugs::gHTMLTail;
-$tail_html =~ s/SUBSTITUTE_DTIME/$dtime/;
-
-set_option("repeatmerged", $repeatmerged);
-set_option("archive", $archive);
-#set_option("include", { map {($_,1)} (split /[\s,]+/, $include) })
-#	if ($include);
-#set_option("exclude", { map {($_,1)} (split /[\s,]+/, $exclude) })
-#	if ($exclude);
+my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime;
 
 my %count;
 my $tag;
 my $note;
+my %htmldescrip = ();
+my %sortkey = ();
 if ($indexon eq "pkg") {
   $tag = "package";
-  %count = countbugs(sub {my %d=@_; return $d{"pkg"}});
+  %count = count_bugs(function => sub {my %d=@_; return splitpackages($d{"pkg"})},
+		     archive => $archive,
+		     );
+  if (defined $param{first}) {
+       %count = map {
+	    if (/^\Q$param{first}\E/) {
+		 ($_,$count{$_});
+	    }
+	    else {
+		 ();
+	    } 
+       } keys %count;
+  }
   $note = "<p>Note that with multi-binary packages there may be other\n";
   $note .= "reports filed under the different binary package names.</p>\n";
+  foreach my $pkg (keys %count) {
+    $sortkey{$pkg} = lc $pkg;
+    $htmldescrip{$pkg} = sprintf('<a href="%s">%s</a> (%s)',
+				 package_links(package => $pkg, links_only=>1),
+				 html_escape($pkg),
+				 package_links(maint=>$maintainers{$pkg}//['']));
+  }
+} elsif ($indexon eq "src") {
+  $tag = "source package";
+  my $pkgsrc = getpkgsrc();
+  if (defined $param{first}) {
+       %count = map {
+	    if (/^\Q$param{first}\E/) {
+		 ($_,$count{$_});
+	    }
+	    else {
+		 ();
+	    } 
+       } keys %count;
+  }
+  %count = count_bugs(function => sub {my %d=@_;
+                          return map {
+                            $pkgsrc->{$_} || $_
+                          } splitpackages($d{"pkg"});
+                         },
+		     archive => $archive,
+		     );
+  $note = "";
+  foreach my $src (keys %count) {
+    $sortkey{$src} = lc $src;
+    $htmldescrip{$src} = sprintf('<a href="%s">%s</a> (%s)',
+                           package_links(src => $src, links_only=>1),
+                           html_escape($src),
+				 package_links(maint => $maintainers{$src}//['']));
+  }
 } elsif ($indexon eq "maint") {
   $tag = "maintainer";
-  %count = countbugs(sub {my %d=@_; my $me; 
-			   $me = $maintainers{$d{"pkg"}} || "";
-			   $me =~ s/\s*\(.*\)\s*//;
-			   $me = $1 if ($me =~ m/<(.*)>/);
-			   return $me;
-			 });
+  my %email2maint = ();
+  %count = count_bugs(function => sub {my %d=@_;
+                          return map {
+                            my @me = getparsedaddrs($maintainers{$_});
+                            foreach my $addr (@me) {
+                              $email2maint{$addr->address} = $addr->format
+                                unless exists $email2maint{$addr->address};
+                            }
+                            map { $_->address } @me;
+                          } splitpackages($d{"pkg"});
+                         },
+		     archive => $archive,
+		     );
+  if (defined $param{first}) {
+       %count = map {
+	    if (/^\Q$param{first}\E/) {
+		 ($_,$count{$_});
+	    }
+	    else {
+		 ();
+	    } 
+       } keys %count;
+  }
   $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";
+  foreach my $maint (keys %count) {
+    $sortkey{$maint} = lc $email2maint{$maint} || "(unknown)";
+    $htmldescrip{$maint} = package_links(maint => $email2maint{$maint}//['']);
+  }
 } elsif ($indexon eq "submitter") {
   $tag = "submitter";
-  %count = countbugs(sub {my %d=@_; my $se; 
-			  ($se = $d{"submitter"} || "") =~ s/\s*\(.*\)\s*//;
-			  $se = $1 if ($se =~ m/<(.*)>/);
-			  return $se;
-			});
+  my %fullname = ();
+  %count = count_bugs(function => sub {my %d=@_;
+                          my @se = getparsedaddrs($d{"submitter"} || "");
+                          foreach my $addr (@se) {
+                            $fullname{$addr->address} = $addr->format
+                              unless exists $fullname{$addr->address};
+                          }
+                          map { $_->address } @se;
+                         },
+		     archive => $archive,
+		     );
+  if (defined $param{first}) {
+       %count = map {
+	    if (/^\Q$param{first}\E/) {
+		 ($_,$count{$_});
+	    }
+	    else {
+		 ();
+	    } 
+       } keys %count;
+  }
+  foreach my $sub (keys %count) {
+    $sortkey{$sub} = lc $fullname{$sub};
+    $htmldescrip{$sub} = sprintf('<a href="%s">%s</a>',
+                           submitterurl($sub),
+			   html_escape($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";
+} elsif ($indexon eq "tag") {
+  $tag = "tag";
+  %count = count_bugs(function => sub {my %d=@_; return split ' ', $d{tags}; },
+		      archive => $archive,
+		     );
+  if (defined $param{first}) {
+       %count = map {
+	    if (/^\Q$param{first}\E/) {
+		 ($_,$count{$_});
+	    }
+	    else {
+		 ();
+	    } 
+       } keys %count;
+  }
+  $note = "";
+  foreach my $keyword (keys %count) {
+    $sortkey{$keyword} = lc $keyword;
+    $htmldescrip{$keyword} = sprintf('<a href="%s">%s</a>',
+                               tagurl($keyword),
+                               html_escape($keyword));
+  }
 }
 
 my $result = "<ul>\n";
-foreach my $x (sort keys %count) {
-  $result .= sprintf('<li><a href="pkgreport.cgi?%s=%s%s">%s</a> %d bugs</li>',
-		     $indexon, $x, ($archive ? "&archive=yes" : ""), $x,
-                     $count{$x});
-  $result .= "\n";
+my @orderedentries;
+if ($sortby eq "count") {
+  @orderedentries = sort { $count{$a} <=> $count{$b} } keys %count;
+} else { # sortby alpha
+  @orderedentries = sort { $sortkey{$a} cmp $sortkey{$b} } keys %count;
+}
+my $skip = $param{skip};
+my $max_results = $param{max_results};
+foreach my $x (@orderedentries) {
+     if (not defined $param{first}) {
+	  $skip-- and next if $skip > 0;
+	  last if --$max_results < 0;
+     }
+  $result .= "<li>" . $htmldescrip{$x} . " has $count{$x} " .
+            ($count{$x} == 1 ? "bug" : "bugs") . "</li>\n";
 }
 $result .= "</ul>\n";
 
 print "Content-Type: text/html\n\n";
 
-print "<HTML><HEAD><TITLE>\n" . 
-    "$debbugs::gProject $Archived $debbugs::gBug reports by $tag\n" .
-    "</TITLE></HEAD>\n" .
-    '<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#800080">' .
-    "\n";
-print "<H1>" . "$debbugs::gProject $Archived $debbugs::gBug report logs: $tag" .
-      "</H1>\n";
-
-print $note;
-print $result;
-
-print "<hr>\n";
-print "$tail_html";
+print fill_in_template(template=>'cgi/pkgindex.tmpl',
+		       variables => {count => \%count,
+				     param => \%param,
+				     result => $result,
+				     html_escape => \&Debbugs::CGI::html_escape,
+				     archived => $Archived,
+				     note => $note,
+				     tag => $tag,
+				    },
+                       hole_var => {'&strftime' => \&POSIX::strftime,
+                                   },
+                      );
 
-print "</body></html>\n";