From: cjwatson <>
Date: Sat, 7 Dec 2002 07:09:10 +0000 (-0800)
Subject: [project @ 2002-12-06 23:09:10 by cjwatson]
X-Git-Tag: release/2.6.0~975
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=60b926dcb25e25164bbb2d47d97f5b72de537b8e;p=debbugs.git

[project @ 2002-12-06 23:09:10 by cjwatson]
Honour includes and excludes for state/severity in raw mode as well as in
normal mode (#159827 and others).
---

diff --git a/cgi/common.pl b/cgi/common.pl
index 99b965cb..340bbdf3 100644
--- a/cgi/common.pl
+++ b/cgi/common.pl
@@ -322,7 +322,13 @@ sub htmlizebugs {
             }
 	    next unless ($okay);
 	}
-	    
+	next if @common_pending_include and
+	     not grep { $_ eq $status{pending} } @common_pending_include;
+	next if @common_severity_include and
+	     not grep { $_ eq $status{severity} } @common_severity_include;
+	next if grep { $_ eq $status{pending} } @common_pending_exclude;
+	next if grep { $_ eq $status{severity} } @common_severity_exclude;
+
 	my $html = sprintf "<li><a href=\"%s\">#%d: %s</a>\n<br>",
 	    bugurl($bug), $bug, htmlsanit($status{subject});
 	$html .= htmlindexentrystatus(\%status) . "\n";
@@ -336,20 +342,16 @@ sub htmlizebugs {
 	$result .= "<UL>\n" . join("", @rawsort ) . "</UL>\n";
     } else {
 	my @pendingList = qw(pending forwarded pending-fixed fixed done);
-	@pendingList = @common_pending_include if @common_pending_include;
 	@pendingList = reverse @pendingList if $common_pending_reverse;
 #print STDERR join(",",@pendingList)."\n";
 #print STDERR join(",",@common_pending_include).":$#common_pending_include\n";
     foreach my $pending (@pendingList) {
-	next if grep( /^$pending$/, @common_pending_exclude);
 	my @severityList = @debbugs::gSeverityList;
-	@severityList = @common_severity_include if @common_severity_include;
 	@severityList = reverse @severityList if $common_severity_reverse;
 #print STDERR join(",",@severityList)."\n";
 
 #        foreach my $severity(@debbugs::gSeverityList) {
         foreach my $severity(@severityList) {
-	    next if grep( /^$severity$/, @common_severity_exclude);
             $severity = $debbugs::gDefaultSeverity if ($severity eq '');
             next unless defined $section{${pending} . "_" . ${severity}};
             $result .= "<HR><H2>$debbugs::gSeverityDisplay{$severity} - $displayshowpending{$pending}</H2>\n";