From eacda62b8bb05eab5301a985b8970ab897f0b723 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 27 Jul 2020 12:26:41 +0000 Subject: [PATCH] Bug 26037: openlibrary.org is hit on every Koha requests This patch moves the inclusion of Open Library JavaScript from opac-bottom.inc to the three templates where it might be used. In addition, the Open Library JS has been modified to check for the existence of the relevant markup on the page before executing a query. Unrelated: The Open Library label is now hidden when the status returned is "Not found." Previously this information was displayed. To test, apply the patch and enable the OpenLibrarySearch system preference. - Perform a search in the OPAC which will return results from Open Library. Some ISBNs: 0140423826, 0395082552, 0679436405. - On the search result page there should be an Open Library "Read now" button for each result that can be opened for reading in Open Library. - Add these titles to a list and view the list. - The "Read now" button should appear on the list page. - View the details for one of these titles. - The "Read now" button should appear on the page below the holdings. - Watch the browser's developer tools on these and other pages in the OPAC. There should be no errors in the console and no 404 errors in the network tab. --- .../bootstrap/en/includes/opac-bottom.inc | 14 ++++-------- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 3 +++ .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 7 +++++- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 ++++ koha-tmpl/opac-tmpl/bootstrap/js/openlibrary.js | 25 ++++++++++++---------- 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 9c4649ea88..c6d9414beb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -189,6 +189,10 @@ $.widget.bridge('uitooltip', $.ui.tooltip); var MSG_OVERDRIVE_DOWNLOAD_AS = _( "Download as: " ); var MSG_OVERDRIVE_CANNOT_CHECKOUT = _("Item cannot be checked out. There are no available formats"); [% END %] + [% IF OpenLibraryCovers || OpenLibrarySearch %] + var NO_OL_JACKET = _("No cover image available"); + var OL_PREVIEW = _("Preview"); + [% END %] [% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %] $(window).load(function() { verify_images(); @@ -244,16 +248,6 @@ $.widget.bridge('uitooltip', $.ui.tooltip); [% END %] -[% IF OpenLibraryCovers || OpenLibrarySearch %] - [% Asset.js("js/openlibrary.js") | $raw %] - -[% END %] - [% IF OPACLocalCoverImages %] [% Asset.js("js/localcovers.js") | $raw %]