use Debbugs::Config qw(:globals :text);
use Debbugs::User;
use Debbugs::CGI qw(version_url);
-use Debbugs::Common qw(getparsedaddrs);
+use Debbugs::Common qw(getparsedaddrs :date);
use Debbugs::Bugs qw(get_bugs);
use vars qw($gPackagePages $gWebDomain %gSeverityDisplay @gSeverityList);
my $ordering = $param{'ordering'};
my $raw_sort = ($param{'raw'} || "no") eq "yes";
my $old_view = ($param{'oldview'} || "no") eq "yes";
+my $age_sort = ($param{'age'} || "no") eq "yes";
unless (defined $ordering) {
$ordering = "normal";
$ordering = "oldview" if $old_view;
$ordering = "raw" if $raw_sort;
+ $ordering = 'age' if $age_sort;
}
+my ($bug_order) = $ordering =~ /(age(?:rev)?)/;
+$bug_order = '' if not defined $bug_order;
my $bug_rev = ($param{'bug-rev'} || "no") eq "yes";
my $pend_rev = ($param{'pend-rev'} || "no") eq "yes";
"normal" => [ qw(status severity classification) ],
);
-my ($pkg, $src, $maint, $maintenc, $submitter, $severity, $status, $tag, $usertag);
+my ($pkg, $src, $maint, $maintenc, $submitter, $severity, $status, $tag, $usertag,
+ $owner,
+ );
my %which = (
'pkg' => \$pkg,
'severity' => \$severity,
'tag' => \$tag,
'usertag' => \$usertag,
+ 'owner' => \$owner,
);
my @allowedEmpty = ( 'maint' );
my %bugusertags;
my %ut;
for my $user (split /[\s*,]+/, $users) {
- next unless ($user =~ m/..../);
+ next unless length($user) >= 4;
add_user($user);
}
set_option("show_list_header", $show_list_header);
set_option("show_list_footer", $show_list_footer);
+our %seen_users;
sub add_user {
my $ut = \%ut;
my $u = shift;
+ return if $seen_users{$u};
+ $seen_users{$u} = 1;
+
my $user = Debbugs::User::get_user($u);
my %vis = map { $_, 1 } @{$user->{"visible_cats"}};
if (defined $pkg) {
$title = "package $pkg";
add_user("$pkg\@packages.debian.org");
+ # figure out the source package
+ my $pkgsrc = getpkgsrc();
+ add_user($pkgsrc->{$pkg}.'@packages.debian.org')
+ if defined $pkgsrc->{$pkg};
if (defined $version) {
$title .= " (version $version)";
} elsif (defined $dist) {
$title .= " ($verdesc)" if defined $verdesc;
}
my @pkgs = split /,/, $pkg;
- @bugs = get_bugs(package=>\@pkgs);
+ @bugs = get_bugs(package=>\@pkgs,
+ archive=>$archive
+ );
} elsif (defined $src) {
add_user("$src\@packages.debian.org");
$title = "source $src";
my $verdesc = getversiondesc($src);
$title .= " ($verdesc)" if defined $verdesc;
}
- @bugs = get_bugs(src=>[split /,/, $src]);
+ @bugs = get_bugs(src=>[split /,/, $src],
+ archive=>$archive
+ );
} elsif (defined $maint) {
add_user($maint);
$title = "maintainer $maint";
$title .= " in $dist" if defined $dist;
- @bugs = get_bugs(maint=>[split /,/,$maint]);
+ if ($maint eq "") {
+ my %maintainers = %{getmaintainers()};
+ @bugs = @{getbugs(sub {my %d=@_;
+ foreach my $try (splitpackages($d{"pkg"})) {
+ return 1 if !getparsedaddrs($maintainers{$try});
+ }
+ return 0;
+ })};
+ } else {
+ @bugs = get_bugs(maint=>[map {lc ($_)} split /,/,$maint],
+ archive=>$archive
+ );
+ }
} elsif (defined $maintenc) {
my %maintainers = %{getmaintainers()};
$title = "encoded maintainer $maintenc";
add_user($submitter);
$title = "submitter $submitter";
$title .= " in $dist" if defined $dist;
- my @submitters = split /,/, $submitter;
- @bugs = get_bugs(submitter => \@submitters);
+ my @submitters = map {lc ($_)} split /,/, $submitter;
+ @bugs = get_bugs(submitter => \@submitters,
+ archive=>$archive
+ );
} elsif (defined($severity) && defined($status)) {
$title = "$status $severity bugs";
$title .= " in $dist" if defined $dist;
return grep(exists $tags{$_}, @tags);
})};
}
+elsif (defined $owner) {
+ $title = "bugs owned by $owner";
+ $title .= " in $dist" if defined $dist;
+ my @owners = map {lc ($_)} split /,/, $owner;
+ my %bugs = ();
+ @bugs = get_bugs(owner=>\@owners,
+ archive=>$archive
+ );
+
+}
$title = htmlsanit($title);
my @names; my @prior; my @title; my @order;
print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
print "<HTML><HEAD>\n" .
- "<TITLE>$gProject$Archived $gBug report logs: $title</TITLE>\n" .
+ "<TITLE>$title -- $gProject$Archived $gBug report logs</TITLE>\n" .
qq(<link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">) .
"</HEAD>\n" .
'<BODY onload="pagemain();">' .
my $sel_ordraw = ($ordering eq "raw" ? " selected" : "");
my $sel_ordold = ($ordering eq "oldview" ? " selected" : "");
my $sel_ordnor = ($ordering eq "normal" ? " selected" : "");
+my $sel_ordage = ($ordering eq "age" ? " selected" : "");
my $chk_bugrev = ($bug_rev ? " checked" : "");
my $chk_pendrev = ($pend_rev ? " checked" : "");
<option value=raw$sel_ordraw>bug number only</option>
<option value=old$sel_ordold>status and severity</option>
<option value=normal$sel_ordnor>status, severity and classification</option>
+<option value=age$sel_ordage>status, severity, classification, and age</option>
EOF
{
status => \%status,
days_until => 1,
);
- if ($days >= 0) {
- $result .= ";\n<strong>Will be archived" . ( $days == 0 ? " today" : $days == 1 ? " in $days day" : " in $days days" ) . "</strong>";
+ if ($days >= 0 and defined $status{location} and $status{location} ne 'archive') {
+ $result .= ";\n<strong>Can be archived" . ( $days == 0 ? " today" : $days == 1 ? " in $days day" : " in $days days" ) . "</strong>";
}
+ elsif (defined $status{location} and $status{location} eq 'archived') {
+ $result .= ";\n<strong>Archived.</strong>";
+ }
}
unless (length($status{done})) {
split /[,\s]+/,$status{forwarded}
);
}
- my $daysold = int((time - $status{date}) / 86400); # seconds to days
- if ($daysold >= 7) {
+ # Check the age of the logfile
+ my ($days_last,$eng_last) = secs_to_english(time - $status{log_modified});
+ my ($days,$eng) = secs_to_english(time - $status{date});
+
+ if ($days >= 7) {
my $font = "";
my $efont = "";
- $font = "em" if ($daysold > 30);
- $font = "strong" if ($daysold > 60);
+ $font = "em" if ($days > 30);
+ $font = "strong" if ($days > 60);
$efont = "</$font>" if ($font);
$font = "<$font>" if ($font);
- my $yearsold = int($daysold / 365);
- $daysold -= $yearsold * 365;
-
- $result .= ";\n $font";
- my @age;
- push @age, "1 year" if ($yearsold == 1);
- push @age, "$yearsold years" if ($yearsold > 1);
- push @age, "1 day" if ($daysold == 1);
- push @age, "$daysold days" if ($daysold > 1);
- $result .= join(" and ", @age);
- $result .= " old$efont";
+ $result .= ";\n ${font}$eng old$efont";
}
+ if ($days_last > 7) {
+ my $font = "";
+ my $efont = "";
+ $font = "em" if ($days_last > 30);
+ $font = "strong" if ($days_last > 60);
+ $efont = "</$font>" if ($font);
+ $font = "<$font>" if ($font);
+
+ $result .= ";\n ${font}Modified $eng_last ago$efont";
+ }
}
$result .= ".";
next unless %status;
next if bugfilter($bug, %status);
- my $html = sprintf "<li><a href=\"%s\">#%d: %s</a>\n<br>",
+ my $html = sprintf "<li><a href=\"%s\">#%d: %s</a>\n<br>",
bugurl($bug), $bug, htmlsanit($status{subject});
$html .= pkg_htmlindexentrystatus(\%status) . "\n";
-
+ push @status, [ $bug, \%status, $html ];
+ }
+ if ($bug_order eq 'age') {
+ # MWHAHAHAHA
+ @status = sort {$a->[1]{log_modified} <=> $b->[1]{log_modified}} @status;
+ }
+ elsif ($bug_order eq 'agerev') {
+ @status = sort {$b->[1]{log_modified} <=> $a->[1]{log_modified}} @status;
+ }
+ for my $entry (@status) {
my $key = "";
for my $i (0..$#prior) {
- my $v = get_bug_order_index($prior[$i], \%status);
+ my $v = get_bug_order_index($prior[$i], $entry->[1]);
$count{"g_${i}_${v}"}++;
$key .= "_$v";
}
- $section{$key} .= $html;
+ $section{$key} .= $entry->[2];
$count{"_$key"}++;
-
- push @status, [ $bug, \%status, $html ];
}
my $result = "";
sub pkg_htmlselectsuite {
my $id = sprintf "b_%d_%d_%d", $_[0], $_[1], $_[2];
my @suites = ("stable", "testing", "unstable", "experimental");
- my %suiteaka = ("stable", "sarge", "testing", "etch", "unstable", "sid");
+ my %suiteaka = ("stable", "etch", "testing", "lenny", "unstable", "sid");
my $defaultsuite = "unstable";
my $result = sprintf '<select name=dist id="%s">', $id;
$h->{"nam"} = $param{"nam$i"}
if (defined $param{"nam$i"});
- $h->{"ord"} = [ split /,/, $param{"ord$i"} ]
+ $h->{"ord"} = [ split /\s*,\s*/, $param{"ord$i"} ]
if (defined $param{"ord$i"});
- $h->{"ttl"} = [ split /,/, $param{"ttl$i"} ]
+ $h->{"ttl"} = [ split /\s*,\s*/, $param{"ttl$i"} ]
if (defined $param{"ttl$i"});
push @c, $h;
$i = 0;
for my $c (@cats) {
- $i++;
+ $i++;
push @prior, $c->{"pri"};
push @names, ($c->{"nam"} || "Bug attribute #" . $i);
if (defined $c->{"ord"}) {
push @order, [ 0..$#{$prior[-1]} ];
}
my @t = @{ $c->{"ttl"} } if defined $c->{ttl};
- if (($#t+1) < $#{$prior[-1]}) {
- push @t, map { toenglish($prior[-1]->[$_]) } ($#t+1)..($#{$prior[-1]});
+ if (@t < $#{$prior[-1]}) {
+ push @t, map { toenglish($prior[-1][$_]) } @t..($#{$prior[-1]});
}
push @t, $c->{"def"} || "";
push @title, [@t];