Attachment 1903 Details for Bug 4201 – Patch for bug 4201

[patch] Patch for bug 4201

0001-Fixes-bug-4201-Holds-priority-listings-assigning-la.patch (text/plain), 2.92 KB, created by Chris Cormack on 2010-03-31 12:53:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2010-03-31 12:53:00 UTC

Size: 2.92 KB

patch

obsolete

>From 3ccaccfa918f928f048635038cd49fec20ec73d6 Mon Sep 17 00:00:00 2001
>From: Ian Walls <ian.walls@bywatersolutions.com>
>Date: Fri, 19 Mar 2010 14:57:47 +0000
>Subject: [PATCH] Fixes bug 4201: Holds priority listings assigning large numbers
> Tightens SQL to limit by biblionumber, only include desired fields, and
> order by priority descending
> Update SQL also simplied to increment prioritynumber explicitly by 1,
> rather than reassigning a loop-incremented value
> Inline commentary added
>Content-Type: text/plain; charset="utf-8"
>
>---
> C4/Reserves.pm |   31 +++++++++++++++----------------
> 1 files changed, 15 insertions(+), 16 deletions(-)
>
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index fee4fce..5c70c08 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -1787,32 +1787,31 @@ sub _ShiftPriorityByDateAndPriority {
>     my ( $biblio, $resdate, $new_priority ) = @_;
> 
>     my $dbh = C4::Context->dbh;
>-    my $query = "SELECT priority FROM reserves WHERE biblionumber = ? AND ( reservedate > ? OR priority > ? ) ORDER BY priority ASC";
>+    my $query = "SELECT priority FROM reserves WHERE biblionumber = ? AND ( reservedate > ? OR priority > ? ) ORDER BY priority ASC LIMIT 1";
>     my $sth = $dbh->prepare( $query );
>     $sth->execute( $biblio, $resdate, $new_priority );
>-    my ( $min_priority ) = $sth->fetchrow;
>-    $sth->finish;  # $sth might have more data.
>+    my $min_priority = $sth->fetchrow;
>+    # if no such matches are found, $new_priority remains as original value
>     $new_priority = $min_priority if ( $min_priority );
>-    my $updated_priority = $new_priority + 1;
> 
>-    $query = "
>- UPDATE reserves
>-    SET priority = ?
>-  WHERE biblionumber = ?
>-    AND borrowernumber = ?
>-    AND reservedate = ?
>-    AND found IS NULL";
>+    # Shift the priority up by one; works in conjunction with the next SQL statement
>+    $query = "UPDATE reserves
>+              SET priority = priority+1
>+              WHERE biblionumber = ?
>+              AND borrowernumber = ?
>+              AND reservedate = ?
>+              AND found IS NULL";
>     my $sth_update = $dbh->prepare( $query );
> 
>-    $query = "SELECT * FROM reserves WHERE priority >= ?";
>+    # Select all reserves for the biblio with priority greater than $new_priority, and order greatest to least
>+    $query = "SELECT borrowernumber, reservedate FROM reserves WHERE priority >= ? AND biblionumber = ? ORDER BY priority DESC";
>     $sth = $dbh->prepare( $query );
>-    $sth->execute( $new_priority );
>+    $sth->execute( $new_priority, $biblio );
>     while ( my $row = $sth->fetchrow_hashref ) {
>-	$sth_update->execute( $updated_priority, $biblio, $row->{borrowernumber}, $row->{reservedate} );
>-	$updated_priority++;
>+	$sth_update->execute( $biblio, $row->{borrowernumber}, $row->{reservedate} );
>     }
> 
>-    return $new_priority;  # so the caller knows what priority they end up at
>+    return $new_priority;  # so the caller knows what priority they wind up receiving
> }
> 
> =back
>-- 
>1.5.6.5
>

Actions: View | Diff | Splinter Review

Attachments on bug 4201: 1902 | 1903