Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 25958: (QA follow-up) Implement filter in database query instead of in loop

Browse source 
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Kyle Hall 2020-08-24 13:13:17 -04:00 committed by Jonathan Druart
parent d99651efd0
commit 66382458dc
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
misc/cronjobs/longoverdue.pl
View file

@ -36,7 +36,6 @@ BEGIN {
use Getopt::Long; use Getopt::Long;
use Pod::Usage; use Pod::Usage;
use List::Util qw/ any /;
use C4::Circulation qw/LostItem MarkIssueReturned/; use C4::Circulation qw/LostItem MarkIssueReturned/;
use C4::Context; use C4::Context;
@ -298,6 +297,15 @@ sub bounds {
# FIXME - This sql should be inside the API. # FIXME - This sql should be inside the API.
sub longoverdue_sth { sub longoverdue_sth {
my ( $params ) = @_;
my $skip_lost_values = $params->{skip_lost_values};
my $skip_lost_values_sql = q{};
if ( @$skip_lost_values ) {
my $values = join( ',', map { qq{'$_'} } @$skip_lost_values );
$skip_lost_values_sql = "AND itemlost NOT IN ( $values )"
}
my $query = " my $query = "
SELECT items.itemnumber, borrowernumber, date_due, itemlost SELECT items.itemnumber, borrowernumber, date_due, itemlost
FROM issues, items FROM issues, items
@ -305,6 +313,7 @@ sub longoverdue_sth {
AND DATE_SUB(CURDATE(), INTERVAL ? DAY) > date_due AND DATE_SUB(CURDATE(), INTERVAL ? DAY) > date_due
AND DATE_SUB(CURDATE(), INTERVAL ? DAY) <= date_due AND DATE_SUB(CURDATE(), INTERVAL ? DAY) <= date_due
AND itemlost <> ? AND itemlost <> ?
$skip_lost_values_sql
ORDER BY date_due ORDER BY date_due
"; ";
return C4::Context->dbh->prepare($query); return C4::Context->dbh->prepare($query);
@ -376,7 +385,7 @@ my $i = 0;
# FIXME - The item is only marked returned if you supply --charge . # FIXME - The item is only marked returned if you supply --charge .
# We need a better way to handle this. # We need a better way to handle this.
# #
my $sth_items = longoverdue_sth(); my $sth_items = longoverdue_sth({ skip_lost_values => \@skip_lost_values });
foreach my $startrange (sort keys %$lost) { foreach my $startrange (sort keys %$lost) {
if( my $lostvalue = $lost->{$startrange} ) { if( my $lostvalue = $lost->{$startrange} ) {
@ -389,10 +398,6 @@ foreach my $startrange (sort keys %$lost) {
$sth_items->execute($startrange, $endrange, $lostvalue); $sth_items->execute($startrange, $endrange, $lostvalue);
$count=0; $count=0;
ITEM: while (my $row=$sth_items->fetchrow_hashref) { ITEM: while (my $row=$sth_items->fetchrow_hashref) {
if ( @skip_lost_values ) {
next ITEM if any { $_ eq $row->{itemlost} } @skip_lost_values;
}
if( $filter_borrower_categories ) { if( $filter_borrower_categories ) {
my $category = uc Koha::Patrons->find( $row->{borrowernumber} )->categorycode(); my $category = uc Koha::Patrons->find( $row->{borrowernumber} )->categorycode();
next ITEM unless ( $category_to_process{ $category } ); next ITEM unless ( $category_to_process{ $category } );