From 12fc84358a5efc312ef3862c2e747cfbed3ba0ca Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 26 Apr 2024 17:41:06 +0000 Subject: [PATCH] Bug 36672: Circulation rules are performing too many lookups Looking at the template, for every section after the main rules block we loop over categories or itemtypes, and lookup the value for each rule name. In systems with large numbers of categories and item types this becomes very slow. In the rules section, we have already built a hash of rules by category and itemtype - we should continue to use this throughout the page. Test Plan: 1) Apply this patch 2) For each rule section, create and delete a rule 3) No change in behavior should be noted! Signed-off-by: Pedro Amorim Signed-off-by: Martin Renvoize (cherry picked from commit aa2befcec89b867c536d2f38203dc817adcf2b5c) Signed-off-by: Lucas Gass --- .../prog/en/modules/admin/smart-rules.tt | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 8d0562edab..26d44e54c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -824,9 +824,10 @@ [% FOREACH c IN categorycodes %] [% NEXT UNLESS c %] - [% SET patron_maxissueqty = CirculationRules.Search( branchcode, c, undef, 'patron_maxissueqty' ) %] - [% SET patron_maxonsiteissueqty = CirculationRules.Search( branchcode, c, undef, 'patron_maxonsiteissueqty' ) %] - [% SET max_holds = CirculationRules.Search( branchcode, c, undef, 'max_holds' ) %] + [% SET i = undef %] + [% SET patron_maxissueqty = all_rules.$c.$i.patron_maxissueqty %] + [% SET patron_maxonsiteissueqty = all_rules.$c.$i.patron_maxonsiteissueqty %] + [% SET max_holds = all_rules.$c.$i.max_holds %] [% IF ( patron_maxissueqty.defined && patron_maxissueqty != '' ) || ( patron_maxonsiteissueqty.defined && patron_maxonsiteissueqty != '' ) || ( max_holds.defined && max_holds != '' ) %] @@ -902,11 +903,8 @@   [% FOREACH c IN categorycodes %] - [% SET c = '*' UNLESS c.defined AND c != '' %] [% FOREACH i IN itemtypes %] - [% SET i = '*' UNLESS i.defined AND i != '' %] - - [% SET waiting_hold_cancellation = CirculationRules.Search( current_branch, c, i, 'waiting_hold_cancellation' ) %] + [% SET waiting_hold_cancellation = all_rules.$c.$i.waiting_hold_cancellation %] [% IF ( waiting_hold_cancellation.defined && waiting_hold_cancellation != '' ) %] @@ -932,7 +930,7 @@ [% END %] - Delete + Delete [% END %] @@ -987,7 +985,8 @@ [% FOREACH c IN categorycodes %] [% NEXT UNLESS c %] - [% SET open_article_requests_limit = CirculationRules.Search( branchcode, c, undef, 'open_article_requests_limit' ) %] + [% SET i = undef %] + [% SET open_article_requests_limit = all_rules.$c.$i.open_article_requests_limit %] [% IF ( open_article_requests_limit.defined && open_article_requests_limit != '' ) %] @@ -1041,9 +1040,8 @@   [% FOREACH c IN categorycodes %] - [% SET c = '*' UNLESS c.defined AND c != '' %] - - [% SET article_request_fee = CirculationRules.Search( current_branch, c, undef, 'article_request_fee' ) %] + [% SET i = undef %] + [% SET article_request_fee = all_rules.$c.$i.article_request_fee %] [% IF ( article_request_fee.defined && article_request_fee != '' ) %] @@ -1307,9 +1305,11 @@   [% FOREACH i IN itemtypeloop %] - [% SET holdallowed = CirculationRules.Search( branchcode, undef, i.itemtype, 'holdallowed' ) %] - [% SET hold_fulfillment_policy = CirculationRules.Search( branchcode, undef, i.itemtype, 'hold_fulfillment_policy' ) %] - [% SET returnbranch = CirculationRules.Search( branchcode, undef, i.itemtype, 'returnbranch' ) %] + [% SET it = i.itemtype %] + [% SET c = undef %] + [% SET holdallowed = all_rules.$c.$it.holdallowed %] + [% SET hold_fulfillment_policy = all_rules.$c.$it.hold_fulfillment_policy %] + [% SET returnbranch = all_rules.$c.$it.returnbranch %] [% IF holdallowed || hold_fulfillment_policy || returnbranch %]