X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fcommon.pl;h=05b8941ac7f84f8a2d2e07b9556ba9c6cabf577c;hb=ec74d9703b7f7045ec85d9c66ae19a0710fd0bd9;hp=98f66dbc5e64e9ff00d5f29d1975922c19cb73f8;hpb=eaebd4ad47eea544709473b9409499b40fce3101;p=debbugs.git
diff --git a/cgi/common.pl b/cgi/common.pl
index 98f66db..05b8941 100644
--- a/cgi/common.pl
+++ b/cgi/common.pl
@@ -11,14 +11,15 @@ use URI::Escape;
use Debbugs::Config qw(:globals :text);
$config_path = '/etc/debbugs';
$lib_path = '/usr/lib/debbugs';
-require "$lib_path/errorlib";
+#require "$lib_path/errorlib";
use Debbugs::Packages qw(:versions :mapping);
use Debbugs::Versions;
use Debbugs::MIME qw(decode_rfc1522);
use Debbugs::Common qw(:util);
-use Debbugs::Status qw(:read :versions);
+use Debbugs::Status qw(:status :read :versions);
use Debbugs::CGI qw(:all);
+use Debbugs::Bugs qw(count_bugs);
$MLDBM::RemoveTaint = 1;
@@ -236,32 +237,6 @@ $debug = 1 if (defined $ret{"debug"} && $ret{"debug"} eq "aj");
return %ret;
}
-sub quitcgi {
- my $msg = shift;
- print "Content-Type: text/html\n\n";
- print "Error\n";
- print "An error occurred. Dammit.\n";
- print "Error was: $msg.\n";
- print "\n";
- exit 0;
-}
-
-#sub abort {
-# my $msg = shift;
-# my $Archive = $common_archive ? "archive" : "";
-# print header . start_html("Sorry");
-# print "Sorry bug #$msg doesn't seem to be in the $Archive database.\n";
-# print end_html;
-# exit 0;
-#}
-
-# Split a package string from the status file into a list of package names.
-sub splitpackages {
- my $pkgs = shift;
- return unless defined $pkgs;
- return map lc, split /[ \t?,()]+/, $pkgs;
-}
-
# Generate a comma-separated list of HTML links to each package given in
# $pkgs. $pkgs may be empty, in which case an empty string is returned, or
# it may be a comma-separated list of package names.
@@ -396,8 +371,6 @@ sub urlargs {
return $args;
}
-sub submitterurl { pkg_url(submitter => emailfromrfc822($_[0] || "")); }
-sub mainturl { pkg_url(maint => emailfromrfc822($_[0] || "")); }
sub pkgurl { pkg_url(pkg => $_[0] || ""); }
sub srcurl { pkg_url(src => $_[0] || ""); }
sub tagurl { pkg_url(tag => $_[0] || ""); }
@@ -481,7 +454,7 @@ sub allbugs {
return @{getbugs(sub { 1 })};
}
-sub bugmatches(\%\%) {
+sub bugmatches {
my ($hash, $status) = @_;
foreach my $key( keys( %$hash ) ) {
my $value = $hash->{$key};
@@ -490,14 +463,14 @@ sub bugmatches(\%\%) {
}
return 0;
}
-sub bugfilter($%) {
- my ($bug, %status) = @_;
- our (%seenmerged);
- if (%common_include) {
- return 1 if (!bugmatches(%common_include, %status));
+sub bugfilter {
+ my ($bug, $status,$seen_merged,$common_include,$common_exclude,$repeat_merged,) = @_;
+ #our (%seenmerged);
+ if ($common_include) {
+ return 1 if (!bugmatches($common_include, $status));
}
- if (%common_exclude) {
- return 1 if (bugmatches(%common_exclude, %status));
+ if ($common_exclude) {
+ return 1 if (bugmatches($common_exclude, $status));
}
my @merged = sort {$a<=>$b} $bug, split(/ /, $status{mergedwith});
my $daysold = int((time - $status{date}) / 86400); # seconds to days
@@ -614,27 +587,9 @@ sub htmlizebugs {
}
sub countbugs {
- my $bugfunc = shift;
- if ($common_archive) {
- open I, "<$gSpoolDir/index.archive"
- or &quitcgi("$gSpoolDir/index.archive: $!");
- } else {
- open I, "<$gSpoolDir/index.db"
- or &quitcgi("$gSpoolDir/index.db: $!");
- }
-
- my %count = ();
- while()
- {
- if (m/^(\S+)\s+(\d+)\s+(\d+)\s+(\S+)\s+\[\s*([^]]*)\s*\]\s+(\w+)\s+(.*)$/) {
- my @x = $bugfunc->(pkg => $1, bug => $2, status => $4,
- submitter => $5, severity => $6, tags => $7);
- local $_;
- $count{$_}++ foreach @x;
- }
- }
- close I;
- return %count;
+ return count_bugs(function=>shift,
+ archive => $commonarchive,
+ );
}
sub getbugs {
@@ -713,66 +668,18 @@ sub maintencoded {
return $encoded;
}
-my $_maintainer;
-sub getmaintainers {
- return $_maintainer if $_maintainer;
- my %maintainer;
-
- open(MM,"$gMaintainerFile") or &quitcgi("open $gMaintainerFile: $!");
- while() {
- next unless m/^(\S+)\s+(\S.*\S)\s*$/;
- ($a,$b)=($1,$2);
- $a =~ y/A-Z/a-z/;
- $maintainer{$a}= $b;
- }
- close(MM);
- if (defined $gMaintainerFileOverride) {
- open(MM,"$gMaintainerFileOverride") or &quitcgi("open $gMaintainerFileOverride: $!");
- while() {
- next unless m/^(\S+)\s+(\S.*\S)\s*$/;
- ($a,$b)=($1,$2);
- $a =~ y/A-Z/a-z/;
- $maintainer{$a}= $b;
- }
- close(MM);
- }
- $_maintainer = \%maintainer;
- return $_maintainer;
-}
-
-my $_pseudodesc;
-sub getpseudodesc {
- return $_pseudodesc if $_pseudodesc;
- my %pseudodesc;
-
- open(PSEUDO, "< $gPseudoDescFile") or &quitcgi("open $gPseudoDescFile: $!");
- while() {
- next unless m/^(\S+)\s+(\S.*\S)\s*$/;
- $pseudodesc{lc $1} = $2;
- }
- close(PSEUDO);
- $_pseudodesc = \%pseudodesc;
- return $_pseudodesc;
-}
sub getbugstatus {
- return get_bug_status(bug => shift,
- $use_bug_idx ?(bug_index => \%bugidx):(),
+ my ($bug) = @_;
+ return get_bug_status(bug => $bug,
+ $use_bug_idx?(bug_index => \%bugidx):(),
usertags => \%common_bugusertags,
- defined $common_dist?(dist => $common_dist):(),
- defined $common_version?(version => $common_version):(),
- defined $common_arch?(arch => $common_arch):()
+ (defined $common_dist)?(dist => $common_dist):(),
+ (defined $common_version)?(version => $common_version):(),
+ (defined $common_arch)?(arch => $common_arch):(),
);
}
-sub buglog {
- my $bugnum = shift;
- my $location = getbuglocation($bugnum, 'log');
- return getbugcomponent($bugnum, 'log', $location) if ($location);
- $location = getbuglocation($bugnum, 'log.gz');
- return getbugcomponent($bugnum, 'log.gz', $location);
-}
-
sub getversiondesc {
my $pkg = shift;