Attachment 142418 Details for Bug 24860 – Bug 24860: Skip non-matching item group holds in CheckReserves

[patch] Bug 24860: Skip non-matching item group holds in CheckReserves

Bug-24860-Skip-non-matching-item-group-holds-in-Ch.patch (text/plain), 3.59 KB, created by Kyle M Hall (khall) on 2022-10-21 16:04:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2022-10-21 16:04:21 UTC

Size: 3.59 KB

patch

obsolete

>From 783a16dfa0f4209e85a5bef35ca2882eca83c2d0 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Tue, 10 Mar 2020 09:02:22 -0400
>Subject: [PATCH] Bug 24860: Skip non-matching item group holds in
> CheckReserves
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>
>Signed-off-by: Rebecca Coert <rcoert@arlingtonva.us>
>---
> C4/Reserves.pm | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index a94d66d2a8..10eb089a9b 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -162,7 +162,7 @@ BEGIN {
>             itemnumber       => $itemnumber,
>             found            => $found,
>             itemtype         => $itemtype,
>-            item_gorup_id    => $item_group_id
>+            item_group_id    => $item_group_id
>         }
>     );
> 
>@@ -957,6 +957,7 @@ sub CheckReserves {
>                 # See if this item is more important than what we've got so far
>                 if ( ( $res->{'priority'} && $res->{'priority'} < $priority ) || $local_hold_match ) {
>                     $item ||= Koha::Items->find($itemnumber);
>+                    next if $res->{item_group_id} && ( !$item->item_group || $item->item_group->id != $res->{item_group_id} );
>                     next if $res->{itemtype} && $res->{itemtype} ne $item->effective_itemtype;
>                     $patron ||= Koha::Patrons->find( $res->{borrowernumber} );
>                     my $branch = GetReservesControlBranch( $item->unblessed, $patron->unblessed );
>@@ -1749,7 +1750,8 @@ sub _Findgroupreserve {
>                reserves.itemnumber          AS itemnumber,
>                reserves.reserve_id          AS reserve_id,
>                reserves.itemtype            AS itemtype,
>-               reserves.non_priority        AS non_priority
>+               reserves.non_priority        AS non_priority,
>+               reserves.item_group_id           AS item_group_id
>         FROM reserves
>         JOIN biblioitems USING (biblionumber)
>         JOIN hold_fill_targets USING (reserve_id)
>@@ -1785,16 +1787,19 @@ sub _Findgroupreserve {
>                reserves.itemnumber          AS itemnumber,
>                reserves.reserve_id          AS reserve_id,
>                reserves.itemtype            AS itemtype,
>-               reserves.non_priority        AS non_priority
>+               reserves.non_priority        AS non_priority,
>+               reserves.item_group_id           AS item_group_id
>         FROM reserves
>         JOIN biblioitems USING (biblionumber)
>         JOIN hold_fill_targets USING (reserve_id)
>+        LEFT JOIN item_group_items ON ( item_group_items.item_id = hold_fill_targets.itemnumber )
>         WHERE found IS NULL
>         AND priority > 0
>         AND item_level_request = 0
>         AND hold_fill_targets.itemnumber = ?
>         AND reservedate <= DATE_ADD(NOW(),INTERVAL ? DAY)
>         AND suspend = 0
>+        AND reserves.item_group_id = item_group_items.item_group_id
>         ORDER BY priority
>     };
>     $sth = $dbh->prepare($title_level_target_query);
>@@ -1820,7 +1825,8 @@ sub _Findgroupreserve {
>                reserves.itemnumber                 AS itemnumber,
>                reserves.reserve_id                 AS reserve_id,
>                reserves.itemtype                   AS itemtype,
>-               reserves.non_priority        AS non_priority
>+               reserves.non_priority               AS non_priority,
>+               reserves.item_group_id              AS item_group_id
>         FROM reserves
>         WHERE reserves.biblionumber = ?
>           AND (reserves.itemnumber IS NULL OR reserves.itemnumber = ?)
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 24860: 100644 | 100645 | 100646 | 100647 | 100648 | 100649 | 100650 | 100651 | 101744 | 101745 | 101746 | 101747 | 101748 | 101749 | 101750 | 101751 | 101827 | 101828 | 101829 | 101830 | 101831 | 101832 | 101833 | 101834 | 101835 | 102230 | 102231 | 102232 | 102233 | 102234 | 102235 | 102236 | 102237 | 102238 | 102239 | 102240 | 102241 | 102242 | 102243 | 102244 | 102245 | 102246 | 102247 | 106589 | 106590 | 106591 | 106592 | 106593 | 106594 | 106595 | 106596 | 106597 | 106682 | 106683 | 106684 | 106685 | 106686 | 106687 | 106688 | 106689 | 106690 | 106742 | 106743 | 106744 | 106745 | 106746 | 106747 | 106748 | 106749 | 106750 | 108458 | 108459 | 108460 | 108461 | 108462 | 108463 | 108464 | 108465 | 108466 | 109097 | 109098 | 109099 | 109100 | 109101 | 109102 | 109103 | 109104 | 109105 | 109171 | 109172 | 109173 | 109174 | 109175 | 109176 | 109177 | 109178 | 109179 | 113616 | 113617 | 113618 | 113619 | 113620 | 113621 | 113622 | 113623 | 113624 | 135922 | 135923 | 135924 | 135925 | 135926 | 135927 | 135928 | 135929 | 135930 | 138221 | 138222 | 138224 | 138225 | 138226 | 138227 | 138228 | 138229 | 138230 | 141214 | 141215 | 141735 | 141736 | 141737 | 141738 | 141739 | 141740 | 141741 | 141742 | 141743 | 141744 | 141745 | 141746 | 141747 | 141748 | 141749 | 141750 | 142413 | 142414 | 142415 | 142416 | 142417 | 142418 | 142419 | 142420 | 142421 | 142422 | 142423 | 142424 | 142425 | 142426 | 142427 | 142428 | 142429 | 142430 | 142827 | 142955 | 142956 | 142957 | 142958 | 142959 | 142960 | 142961 | 142962 | 142963 | 142964 | 142965 | 142966 | 142967 | 142968 | 142969 | 142970 | 142971 | 142972 | 142973 | 142974 | 142975 | 142992 | 142993 | 142994 | 142995 | 142996 | 142997 | 142998 | 142999 | 143000 | 143001 | 143002 | 143003 | 143004 | 143005 | 143006 | 143007 | 143008 | 143009 | 143010 | 143011