From 910815a49ca0dbec4f31fd8a62ea075ccba269f1 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 1 Apr 2020 15:09:48 -0400 Subject: [PATCH] Bug 23173: (follow-up) Small improvements in efficiency Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize --- ill/ill-requests.pl | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl index b1bc552139..df80dd5406 100755 --- a/ill/ill-requests.pl +++ b/ill/ill-requests.pl @@ -86,14 +86,11 @@ if ( $backends_available ) { # Does this backend enable us to insert an availability stage and should # we? If not, proceed as normal. if ( - C4::Context->preference("ILLCheckAvailability") && - $request->_backend_capability( - 'should_display_availability', - $params - ) && # If the user has elected to continue with the request despite # having viewed availability info, this flag will be set - !$params->{checked_availability} + C4::Context->preference("ILLCheckAvailability") + && !$params->{checked_availability} + && $request->_backend_capability( 'should_display_availability', $params ) ) { # Establish which of the installed availability providers # can service our metadata @@ -292,25 +289,24 @@ if ( $backends_available ) { # Prepare availability searching, if required # Get the definition for the z39.50 plugin - my $availability = Koha::Illrequest::Availability->new($request->metadata); - my $services = $availability->get_services({ - ui_context => 'partners', - metadata => { - name => 'ILL availability - z39.50' + if ( C4::Context->preference('ILLCheckAvailability') ) { + my $availability = Koha::Illrequest::Availability->new($request->metadata); + my $services = $availability->get_services({ + ui_context => 'partners', + metadata => { + name => 'ILL availability - z39.50' + } + }); + # Only pass availability searching stuff to the template if + # appropriate + if ( scalar @{$services} > 0 ) { + my $metadata = $availability->prep_metadata($request->metadata); + $template->param( metadata => $metadata ); + $template->param( + services_json => scalar encode_json($services) + ); + $template->param( services => $services ); } - }); - # Only pass availability searching stuff to the template if - # appropriate - if ( - C4::Context->preference('ILLCheckAvailability') && - scalar @{$services} > 0 - ) { - my $metadata = $availability->prep_metadata($request->metadata); - $template->param( metadata => $metadata ); - $template->param( - services_json => scalar encode_json($services) - ); - $template->param( services => $services ); } $template->param( error => $params->{error} ) -- 2.39.5