X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Debbugs%2FBugs.pm;h=5150d11c3c34565c4e7ed59bf0da4e3ce1e78652;hb=0ea01c001c3e07722958665acc783baec2759651;hp=636c65deb2270db7129efa36cc0a425a5072c7d2;hpb=6738ad90240a94fc9aee5303b1287e923f888deb;p=debbugs.git diff --git a/Debbugs/Bugs.pm b/Debbugs/Bugs.pm index 636c65d..5150d11 100644 --- a/Debbugs/Bugs.pm +++ b/Debbugs/Bugs.pm @@ -59,7 +59,7 @@ use Debbugs::Packages qw(getsrcpkgs getpkgsrc); use Debbugs::Common qw(getparsedaddrs package_maintainer getmaintainers make_list hash_slice); use Fcntl qw(O_RDONLY); use MLDBM qw(DB_File Storable); -use List::AllUtils qw(first); +use List::AllUtils qw(first max); use Carp; =head2 get_bugs @@ -201,6 +201,9 @@ my %_get_bugs_common_options = usertags => {type => HASHREF, optional => 1, }, + newest => {type => SCALAR|ARRAYREF, + optional => 1, + }, schema => {type => OBJECT, optional => 1, }, @@ -404,7 +407,7 @@ state $_get_bugs_by_idx_options = {hash_slice(%_get_bugs_common_options, (qw(package submitter severity tag archive), qw(owner src maint bugs correspondent), - qw(affects usertags)) + qw(affects usertags newest)) ) }; sub get_bugs_by_idx{ @@ -420,7 +423,13 @@ sub get_bugs_by_idx{ die "Can't handle empty maint (unmaintained packages) in get_bugs_by_idx"; } } - + if ($param{newest}) { + my $newest_bug = newest_bug(); + my @bugs = ($newest_bug - max(make_list($param{newest})) + 1) .. $newest_bug; + $param{bugs} = [exists $param{bugs}?make_list($param{bugs}):(), + @bugs, + ]; + } # We handle src packages, maint and maintenc by mapping to the # appropriate binary packages, then removing all packages which # don't match all queries @@ -492,7 +501,7 @@ state $_get_bugs_by_db_options = {hash_slice(%_get_bugs_common_options, (qw(package submitter severity tag archive), qw(owner src maint bugs correspondent), - qw(affects usertags)) + qw(affects usertags newest)) ), schema => {type => OBJECT, }, @@ -506,10 +515,7 @@ sub get_bugs_by_db{ my $s = $param{schema}; my $keys = grep {$_ !~ $_non_search_key_regex} keys(%param); die "Need at least 1 key to search by" unless $keys; - my $rs = $param{schema}->resultset('Bug'); - if (exists $param{package}) { - $rs = $rs->search({-or => {map 'bin_package.'}}) - } + my $rs = $s->resultset('Bug'); if (exists $param{severity}) { $rs = $rs->search({'severity.severity' => [make_list($param{severity})], @@ -526,6 +532,14 @@ sub get_bugs_by_db{ ); } } + if (exists $param{newest}) { + $rs = + $rs->search({}, + {order_by => {-desc => 'me.creation'}, + rows => max(make_list($param{newest})), + }, + ); + } if (exists $param{correspondent}) { my $message_rs = $s->resultset('Message')-> @@ -561,8 +575,10 @@ sub get_bugs_by_db{ ); } if (exists $param{package}) { - $rs = $rs->search({'bin_pkg.pkg' => - [make_list($param{package})], + $rs = $rs->search({-or => {'bin_pkg.pkg' => + [make_list($param{package})], + 'me.unknown.package' => + [make_list($param{package})]}, }, {join => {bug_binpackages => 'bin_pkg'}}); } @@ -684,6 +700,13 @@ sub get_bugs_flatfile{ spec => $_get_bugs_flatfile_options ); my $flatfile; + if ($param{newest}) { + my $newest_bug = newest_bug(); + my @bugs = ($newest_bug - max(make_list($param{newest})) + 1) .. $newest_bug; + $param{bugs} = [exists $param{bugs}?make_list($param{bugs}):(), + @bugs, + ]; + } if ($param{archive}) { $flatfile = IO::File->new("$config{spool_dir}/index.archive", 'r') or die "Unable to open $config{spool_dir}/index.archive for reading: $!";