From f0e042d0268e957cba895145e4b1ba1fbb95bf63 Mon Sep 17 00:00:00 2001 From: ajt <> Date: Mon, 22 Aug 2005 13:14:45 -0800 Subject: [PATCH] [project @ 2005-08-22 14:14:45 by ajt] support for mindays and maxdays --- cgi/common.pl | 9 +++++++++ cgi/pkgreport.cgi | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/cgi/common.pl b/cgi/common.pl index 06357687..2f51b7c4 100644 --- a/cgi/common.pl +++ b/cgi/common.pl @@ -18,6 +18,8 @@ use Debbugs::MIME qw(decode_rfc1522); $MLDBM::RemoveTaint = 1; +my $common_mindays = 0; +my $common_maxdays = -1; my $common_archive = 0; my $common_repeatmerged = 1; my %common_include = (); @@ -176,6 +178,8 @@ sub set_option { if ($opt eq "version") { $common_version = $val; } if ($opt eq "dist") { $common_dist = $val; } if ($opt eq "arch") { $common_arch = $val; } + if ($opt eq "maxdays") { $common_maxdays = $val; } + if ($opt eq "mindays") { $common_mindays = $val; } } sub readparse { @@ -407,6 +411,8 @@ sub urlargs { my $args = ''; $args .= ";archive=yes" if $common_archive; $args .= ";repeatmerged=no" unless $common_repeatmerged; + $args .= ";mindays=${common_mindays}" unless $common_mindays == 0; + $args .= ";maxdays=${common_maxdays}" unless $common_maxdays == -1; $args .= ";version=$common_version" if defined $common_version; $args .= ";dist=$common_dist" if defined $common_dist; $args .= ";arch=$common_arch" if defined $common_arch; @@ -525,6 +531,9 @@ sub bugfilter($%) { 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 + return 1 unless ($common_mindays <= $daysold); + return 1 unless ($common_maxdays == -1 || $daysold <= $common_maxdays); return 1 unless ($common_repeatmerged || !$seenmerged{$merged[0]}); $seenmerged{$merged[0]} = 1; return 0; diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index 1f80561e..4860c797 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -35,6 +35,8 @@ my $pend_exc = $param{'&pend-exc'} || $param{'pend-exc'} || ""; my $pend_inc = $param{'&pend-inc'} || $param{'pend-inc'} || ""; my $sev_exc = $param{'&sev-exc'} || $param{'sev-exc'} || ""; my $sev_inc = $param{'&sev-inc'} || $param{'sev-inc'} || ""; +my $maxdays = ($param{'maxdays'} || -1); +my $mindays = ($param{'mindays'} || 0); my $version = $param{'version'} || undef; my $dist = $param{'dist'} || undef; my $arch = $param{'arch'} || undef; @@ -111,6 +113,8 @@ set_option("pend-exc", $pend_exc); set_option("pend-inc", $pend_inc); set_option("sev-exc", $sev_exc); set_option("sev-inc", $sev_inc); +set_option("maxdays", $maxdays); +set_option("mindays", $mindays); set_option("version", $version); set_option("dist", $dist); set_option("arch", $arch); -- 2.39.5