X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fpkgreport.cgi;h=c36f9f68b8623f8bc0b1b00c7fd6c040a5ff144a;hb=fac30aacb5b9a104a1216af15fc04e227f9ef447;hp=cffc324bc02b0d4a0dc93c8c57d856b03cc11243;hpb=83a34f8b9b0025ec90c70b8d2be2a8f9c65528e7;p=debbugs.git diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index cffc324..c36f9f6 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -20,7 +20,7 @@ use Debbugs::Config qw(:globals :text :config); use Debbugs::User; use Debbugs::CGI qw(version_url maint_decode); use Debbugs::Common qw(getparsedaddrs :date make_list getmaintainers); -use Debbugs::Bugs qw(get_bugs bug_filter); +use Debbugs::Bugs qw(get_bugs bug_filter newest_bug); use Debbugs::Packages qw(getsrcpkgs getpkgsrc get_versions); use Debbugs::Status qw(:status); use Debbugs::CGI qw(:all); @@ -41,7 +41,7 @@ our %param = cgi_parameters(query => $q, single => [qw(ordering archive repeatmerged), qw(bug-rev pend-rev sev-rev), qw(maxdays mindays version), - qw(data which dist), + qw(data which dist newest), ], default => {ordering => 'normal', archive => 0, @@ -85,42 +85,50 @@ unless (defined $ordering) { $ordering = "raw" if $raw_sort; $ordering = 'age' if $age_sort; } -my ($bug_order) = $ordering =~ /(age(?:rev)?)/; +our ($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"; my $sev_rev = ($param{'sev-rev'} || "no") eq "yes"; -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; -{ - if (defined $param{'vt'}) { - my $vt = $param{'vt'}; - if ($vt eq "none") { $dist = undef; $arch = undef; $version = undef; } - if ($vt eq "bysuite") { - $version = undef; - $arch = undef if ($arch eq "any"); - } - if ($vt eq "bypkg" || $vt eq "bysrc") { $dist = undef; $arch = undef; } - } - if (defined $param{'includesubj'}) { - my $is = $param{'includesubj'}; - $include .= "," . join(",", map { "subj:$_" } (split /[\s,]+/, $is)); - } - if (defined $param{'excludesubj'}) { - my $es = $param{'excludesubj'}; - $exclude .= "," . join(",", map { "subj:$_" } (split /[\s,]+/, $es)); - } +my @inc_exc_mapping = ({name => 'pending', + incexc => 'include', + key => 'pend-inc', + }, + {name => 'pending', + incexc => 'exclude', + key => 'pend-exc', + }, + {name => 'severity', + incexc => 'include', + key => 'sev-inc', + }, + {name => 'severity', + incexc => 'exclude', + key => 'sev-exc', + }, + {name => 'subject', + incexc => 'include', + key => 'includesubj', + }, + {name => 'subject', + incexc => 'exclude', + key => 'excludesubj', + }, + ); +for my $incexcmap (@inc_exc_mapping) { + push @{$param{$incexcmap->{incexc}}}, map {"$incexcmap->{name}:$_"} + map{split /\s*,\s*/} make_list($param{$incexcmap->{key}}) + if exists $param{$incexcmap->{key}}; + delete $param{$incexcmap->{key}}; } +my $maxdays = ($param{'maxdays'} || -1); +my $mindays = ($param{'mindays'} || 0); +my $version = $param{'version'} || undef; +# XXX Once the options/selection is rewritten, this should go away +my $dist = $param{dist} || undef; our %hidden = map { $_, 1 } qw(status severity classification); our %cats = ( @@ -157,7 +165,7 @@ our %cats = ( ); my @select_key = (qw(submitter maint pkg package src usertag), - qw(status tag maintenc owner severity) + qw(status tag maintenc owner severity newest) ); if (exists $param{which} and exists $param{data}) { @@ -308,7 +316,7 @@ while (my ($key,$value) = splice @search_key_order, 0, 2) { } push @title,$value.' '.join(' or ', @entries); } -my $title = join(' and ', map {/ or /?"($_)":$_} @title); +my $title = $gBugs.' '.join(' and ', map {/ or /?"($_)":$_} @title); @title = (); # we have to special case the maint="" search, unfortunatly. @@ -322,20 +330,26 @@ if (defined $param{maint} and $param{maint} eq "") { return 0; } ); - $title = 'in packages with no maintainer'; + $title = $gBugs.' in packages with no maintainer'; +} +elsif (defined $param{newest}) { + my $newest_bug = newest_bug(); + @bugs = ($newest_bug - $param{newest} + 1) .. $newest_bug; + $title = @bugs.' newest '.$gBugs; } else { #yeah for magick! - @bugs = get_bugs(map {exists $param{$_}?($_,$param{$_}):()} - keys %search_keys, 'archive' + @bugs = get_bugs((map {exists $param{$_}?($_,$param{$_}):()} + keys %search_keys, 'archive'), + usertags => \%ut, ); } if (defined $param{version}) { - $title .= " at version $version"; + $title .= " at version $param{version}"; } elsif (defined $param{dist}) { - $title .= " in $dist"; + $title .= " in $param{dist}"; } $title = html_escape($title); @@ -359,7 +373,7 @@ print "\n" . "\n" . '' . "\n"; -print "

" . "$gProject$Archived $gBug report logs: $gBugs $title" . +print "

" . "$gProject$Archived $gBug report logs: $title" . "

\n"; my $showresult = 1; @@ -412,7 +426,7 @@ sub output_package_info{ print "

You may want to refer to the following individual bug pages:\n"; } #push @pkgs, $src if ( $src && !grep(/^\Q$src\E$/, @pkgs) ); - print join( ", ", map( "$_)) . "\">$_", @pkgs ) ); + print join( ", ", map( "$_,src=>[],newest=>[])) . "\">$_", @pkgs ) ); print ".\n"; } my @references; @@ -431,7 +445,7 @@ sub output_package_info{ } # Only output this if the source listing is non-trivial. if ($srcorbin eq 'binary' and $srcforpkg) { - push @references, sprintf "to the source package %s's bug page", html_escape(munge_url($this,src=>$srcforpkg,package=>[])), html_escape($srcforpkg); + push @references, sprintf "to the source package %s's bug page", html_escape(munge_url($this,src=>$srcforpkg,package=>[],newest=>[])), html_escape($srcforpkg); } } if (@references) { @@ -731,11 +745,26 @@ sub pkg_htmlizebugs { ); my %section = (); + # Make the include/exclude map + my %include; + my %exclude; + for my $include (make_list($param{include})) { + next unless defined $include; + my ($key,$value) = split /\s*:\s*/,$include,2; + next unless defined $value; + push @{$include{$key}}, split /\s*,\s*/, $value; + } + for my $exclude (make_list($param{exclude})) { + next unless defined $exclude; + my ($key,$value) = split /\s*:\s*/,$exclude,2; + next unless defined $value; + push @{$exclude{$key}}, split /\s*,\s*/, $value; + } foreach my $bug (@bugs) { my %status = %{get_bug_status(bug=>$bug, (exists $param{dist}?(dist => $param{dist}):()), - usertags => \%bugusertags, + bugusertags => \%bugusertags, (exists $param{version}?(version => $param{version}):()), (exists $param{arch}?(arch => $param{arch}):()), )}; @@ -744,6 +773,8 @@ sub pkg_htmlizebugs { status => \%status, (exists $param{repeatmerged}?(repeat_merged => $param{repeatmerged}):()), seen_merged => \%seenmerged, + (keys %include ? (include => \%include):()), + (keys %exclude ? (exclude => \%exclude):()), ); my $html = sprintf "

  • #%d: %s\n
    ", @@ -847,7 +878,7 @@ sub pkg_htmlpackagelinks { return 'Package' . (@pkglist > 1 ? 's' : '') . ': ' . join(', ', map { - '' . + '' . $openstrong . html_escape($_) . $closestrong . '' } @pkglist ); @@ -1056,7 +1087,7 @@ sub determine_ordering { while (defined $param{"pri$i"}) { my $h = {}; - my $pri = $param{"pri$i"}; + my ($pri) = make_list($param{"pri$i"}); if ($pri =~ m/^([^:]*):(.*)$/) { $h->{"nam"} = $1; # overridden later if necesary $h->{"pri"} = [ map { "$1=$_" } (split /,/, $2) ]; @@ -1064,12 +1095,12 @@ sub determine_ordering { $h->{"pri"} = [ split /,/, $pri ]; } - $h->{"nam"} = $param{"nam$i"} - if (defined $param{"nam$i"}); - $h->{"ord"} = [ split /\s*,\s*/, $param{"ord$i"} ] - if (defined $param{"ord$i"}); - $h->{"ttl"} = [ split /\s*,\s*/, $param{"ttl$i"} ] - if (defined $param{"ttl$i"}); + ($h->{"nam"}) = make_list($param{"nam$i"}) + if (defined $param{"nam$i"}); + $h->{"ord"} = [ split /\s*,\s*/, make_list($param{"ord$i"}) ] + if (defined $param{"ord$i"}); + $h->{"ttl"} = [ split /\s*,\s*/, make_list($param{"ttl$i"}) ] + if (defined $param{"ttl$i"}); push @c, $h; $i++;