From 6864cee18313d031c7585c8bb721d1477b3583da Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 5 Aug 2015 09:34:24 +0100 Subject: [PATCH] Bug 12748: QA Fixes - Use the constant instead of the code (1 vs EXPECTED) - Avoid interpolation in query - use selectall_arrayref instead of fetchall_arrayref --- C4/Serials.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index b958241..76b8bbe 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -1127,7 +1127,7 @@ sub ModSerialStatus { # create new expected entry if needed (ie : was "expected" and has changed) # BUG 12748: Check if there are no other expected issues. - my $otherIssueExpected = scalar findSerialByStatus(1, $subscriptionid); + my $otherIssueExpected = scalar findSerialByStatus(EXPECTED, $subscriptionid); if ( !$otherIssueExpected && $oldstatus == EXPECTED && $status != EXPECTED ) { my $subscription = GetSubscription($subscriptionid); my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern}); @@ -2740,16 +2740,16 @@ sub _can_do_on_subscription { Returns an array of serials matching a given status and subscription id. =cut + sub findSerialByStatus{ my($status, $subscriptionid) = @_; my $dbh = C4::Context->dbh; - my $query = qq| SELECT * from serial + my $query = q| SELECT * from serial WHERE status = ? AND subscriptionid = ? |; - my $sth = $dbh->prepare($query); - $sth->execute($status, $subscriptionid); - return @{$sth->fetchall_arrayref({})}; + my $serials = $dbh->selectall_arrayref( $query, { Slice => {} }, $status, $subscriptionid ); + return @$serials; } 1; __END__ -- 2.1.0