Bugzilla – Attachment 43511 Details for
Bug 12803
Add ability to skip closed libraries when generating the holds queue
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12803 - Add ability to skip closed libraries when generating the holds queue
Bug-12803---Add-ability-to-skip-closed-libraries-w.patch (text/plain), 10.58 KB, created by
Kyle M Hall (khall)
on 2015-10-16 13:59:32 UTC
(
hide
)
Description:
Bug 12803 - Add ability to skip closed libraries when generating the holds queue
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-10-16 13:59:32 UTC
Size:
10.58 KB
patch
obsolete
>From 0744417dbbe5e7b25ce5429e8e624f14cdb273d6 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 21 Aug 2014 11:22:30 -0400 >Subject: [PATCH] Bug 12803 - Add ability to skip closed libraries when generating the holds queue > >The holds queue is typically generated many times a day in order to >select items to fill holds. Often these items are to be sent to a >different library. However, if the library whose item is picked to fill >a hold is closed, that hold will remain unfilled even if there are other >open libraries who own that item. It would be helpful if we could skip >closed libraries for the purpose of selecting items to fill holds. > >Test Plan: >1) Apply this patch >2) Run updatedatabase.pl >3) Create a record with two items on it, one at Branch A, and one at > Branch B >4) Place a hold for pickup at Branch C >5) Generate the holds queue >6) Note which branch's item is selected for the hold >7) Enable the new system preference HoldsQueueSkipClosed >8) Add today as a holiday for that branch noted in step 6 >9) Regenerate the holds queue >10) View the holds queue, notice the item selected is not from > the closed branch! >11) prove t/db_dependent/HoldsQueue.t > >Signed-off by: Jason Robb <jrobb@sekls.org> >--- > C4/HoldsQueue.pm | 49 ++++++++++++++++---- > installer/data/mysql/atomicupdate/bug_12803.sql | 2 + > installer/data/mysql/sysprefs.sql | 1 + > .../en/modules/admin/preferences/circulation.pref | 7 ++- > t/db_dependent/HoldsQueue.t | 42 ++++++++++++++--- > 5 files changed, 83 insertions(+), 18 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_12803.sql > >diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm >index 08f6307..3057079 100755 >--- a/C4/HoldsQueue.pm >+++ b/C4/HoldsQueue.pm >@@ -29,6 +29,8 @@ use C4::Branch; > use C4::Circulation; > use C4::Members; > use C4::Biblio; >+use C4::Dates qw/format_date/; >+use Koha::DateUtils; > > use List::Util qw(shuffle); > use List::MoreUtils qw(any); >@@ -63,13 +65,25 @@ sub TransportCostMatrix { > my $dbh = C4::Context->dbh; > my $transport_costs = $dbh->selectall_arrayref("SELECT * FROM transport_cost",{ Slice => {} }); > >+ my $today = dt_from_string(); >+ my $calendars; > my %transport_cost_matrix; > foreach (@$transport_costs) { >- my $from = $_->{frombranch}; >- my $to = $_->{tobranch}; >- my $cost = $_->{cost}; >+ my $from = $_->{frombranch}; >+ my $to = $_->{tobranch}; >+ my $cost = $_->{cost}; > my $disabled = $_->{disable_transfer}; >- $transport_cost_matrix{$to}{$from} = { cost => $cost, disable_transfer => $disabled }; >+ $transport_cost_matrix{$to}{$from} = { >+ cost => $cost, >+ disable_transfer => $disabled >+ }; >+ >+ if ( C4::Context->preference("HoldsQueueSkipClosed") ) { >+ $calendars->{$from} ||= Koha::Calendar->new( branchcode => $from ); >+ $transport_cost_matrix{$to}{$from}{disable_transfer} ||= >+ $calendars->{$from}->is_holiday( $today ); >+ } >+ > } > return \%transport_cost_matrix; > } >@@ -601,12 +615,27 @@ sub _trim { > } > > sub load_branches_to_pull_from { >- my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight") >- or return; >- >- my @branches_to_use = map _trim($_), split /,/, $static_branch_list; >- >- @branches_to_use = shuffle(@branches_to_use) if C4::Context->preference("RandomizeHoldsQueueWeight"); >+ my @branches_to_use; >+ >+ my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight"); >+ @branches_to_use = map { _trim($_) } split( /,/, $static_branch_list ) >+ if $static_branch_list; >+ >+ @branches_to_use = >+ Koha::Database->new()->schema()->resultset('Branch') >+ ->get_column('branchcode')->all() >+ unless (@branches_to_use); >+ >+ @branches_to_use = shuffle(@branches_to_use) >+ if C4::Context->preference("RandomizeHoldsQueueWeight"); >+ >+ my $today = dt_from_string(); >+ if ( C4::Context->preference('HoldsQueueSkipClosed') ) { >+ @branches_to_use = grep { >+ !Koha::Calendar->new( branchcode => $_ ) >+ ->is_holiday( $today ) >+ } @branches_to_use; >+ } > > return \@branches_to_use; > } >diff --git a/installer/data/mysql/atomicupdate/bug_12803.sql b/installer/data/mysql/atomicupdate/bug_12803.sql >new file mode 100644 >index 0000000..b6c7e39 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_12803.sql >@@ -0,0 +1,2 @@ >+INSERT INTO systempreferences (variable,value,explanation,type) VALUES >+ ('HoldsQueueSkipClosed', '0', 'If enabled, any libraries that are closed when the holds queue is built will be ignored for the purpose of filling holds.', 'YesNo'); >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 1024a5e..50ec325 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -149,6 +149,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('HighlightOwnItemsOnOPAC','0','','If on, and a patron is logged into the OPAC, items from his or her home library will be emphasized and shown first in search results and item details.','YesNo'), > ('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch|OpacURLBranch','Decides which branch\'s items to emphasize. If PatronBranch, emphasize the logged in user\'s library\'s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha\'s Apache configuration file.','Choice'), > ('HoldsToPullStartDate','2',NULL,'Set the default start date for the Holds to pull list to this many days ago','Integer'), >+('HoldsQueueSkipClosed', '0', NULL, 'If enabled, any libraries that are closed when the holds queue is built will be ignored for the purpose of filling holds.', 'YesNo'), > ('HomeOrHoldingBranch','holdingbranch','holdingbranch|homebranch','Used by Circulation to determine which branch of an item to check with independent branches on, and by search to determine which branch to choose for availability ','Choice'), > ('HTML5MediaEnabled','not','not|opac|staff|both','Show a tab with a HTML5 media player for files catalogued in field 856','Choice'), > ('HTML5MediaExtensions','webm|ogg|ogv|oga|vtt','','Media file extensions','free'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 2e66328..91e5caf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -480,10 +480,15 @@ Circulation: > - pref: ExpireReservesMaxPickUpDelayCharge > class: currency > - >- - Satisfy holds from the libraries >+ - Satisfy holds using items from the libraries > - pref: StaticHoldsQueueWeight > class: multi > - (as branchcodes, separated by commas; if empty, uses all libraries) >+ - when they are >+ - pref: HoldsQueueSkipClosed >+ choices: >+ yes: open >+ no: open or closed > - pref: RandomizeHoldsQueueWeight > choices: > yes: in random order. >diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t >index 97018a7..dc2d7e1 100755 >--- a/t/db_dependent/HoldsQueue.t >+++ b/t/db_dependent/HoldsQueue.t >@@ -8,16 +8,15 @@ > > use Modern::Perl; > >-use C4::Context; >- >+use Test::More tests => 24; > use Data::Dumper; > >-use Test::More tests => 22; >- >- >+use C4::Calendar; >+use C4::Context; > use C4::Branch; > use C4::ItemType; > use C4::Members; >+use Koha::DateUtils; > > BEGIN { > use FindBin; >@@ -55,6 +54,7 @@ my $itemtype = grep { $_->{notforloan} == 1 } @item_types > > #Set up the stage > # Sysprefs and cost matrix >+C4::Context->set_preference('HoldsQueueSkipClosed', 0); > $dbh->do("UPDATE systempreferences SET value = ? WHERE variable = 'StaticHoldsQueueWeight'", undef, > join( ',', @other_branches, $borrower_branchcode, $least_cost_branch_code)); > $dbh->do("UPDATE systempreferences SET value = '0' WHERE variable = 'RandomizeHoldsQueueWeight'"); >@@ -290,12 +290,40 @@ ok( @$holds_queue == 2, "Holds queue filling correct number for default holds po > ok( $holds_queue->[0]->{cardnumber} eq 'CARDNUMBER1', "Holds queue filling 1st correct hold for default holds policy 'from home library'"); > ok( $holds_queue->[1]->{cardnumber} eq 'CARDNUMBER2', "Holds queue filling 2nd correct hold for default holds policy 'from home library'"); > >+# Test skipping hold picks for closed libraries. >+# At this point in the test, we have 2 rows in the holds queue >+# 1 of which is coming from MPL. Let's enable HoldsQueueSkipClosed >+# and make today a holiday for MPL. When we run it again we should only >+# have 1 row in the holds queue >+C4::Context->set_preference('HoldsQueueSkipClosed', 1); >+my $today = dt_from_string(); >+C4::Calendar->new( branchcode => 'MPL' )->insert_single_holiday( >+ day => $today->day(), >+ month => $today->month(), >+ year => $today->year(), >+ title => "$today", >+ description => "$today", >+); >+C4::HoldsQueue::CreateQueue(); >+$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} }); >+is( scalar( @$holds_queue ), 1, "Holds not filled with items from closed libraries" ); >+C4::Context->set_preference('HoldsQueueSkipClosed', 0); >+ > $dbh->do("DELETE FROM default_circ_rules"); > $dbh->do("INSERT INTO default_circ_rules ( holdallowed ) VALUES ( 2 )"); > C4::HoldsQueue::CreateQueue(); > $holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} }); >-ok( @$holds_queue == 3, "Holds queue filling correct number for holds for default holds policy 'from any library'" ); >-#warn "HOLDS QUEUE: " . Data::Dumper::Dumper( $holds_queue ); >+is( scalar( @$holds_queue ), 3, "Holds queue filling correct number for holds for default holds policy 'from any library'" ); >+ >+# Test skipping hold picks for closed libraries without transport cost matrix >+# At this point in the test, we have 3 rows in the holds queue >+# one of which is coming from MPL. Let's enable HoldsQueueSkipClosed >+# and use our previously created holiday for MPL. >+# When we run it again we should only have 2 rows in the holds queue >+C4::Context->set_preference( 'HoldsQueueSkipClosed', 1 ); >+C4::HoldsQueue::CreateQueue(); >+$holds_queue = $dbh->selectall_arrayref("SELECT * FROM tmp_holdsqueue", { Slice => {} }); >+is( scalar( @$holds_queue ), 2, "Holds not filled with items from closed libraries" ); > > # Bug 14297 > $borrowernumber = AddMember(%data); >-- >1.7.2.5
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=43511">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12803
:
31057
|
31060
|
31061
|
31062
|
31063
|
31630
|
31631
|
32046
|
32271
|
43509
|
43510
|
43511
|
43512
|
43610
|
43779
|
43833
|
43979
|
45569
|
45570
|
45571
|
45572
|
45573
|
45574
|
45575
|
45576
|
45638
|
45643
|
45644
|
46888
|
46889
|
46890
|
46891
|
46892
|
46893
|
46894
|
46895
|
47246
|
47247
|
48574
|
48575