From 16c751c70201461102e6a27ea0508a07eeebe3de Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Date: Fri, 22 Jun 2018 16:24:38 -0400 Subject: [PATCH] LP#1772680: Fixed issues dealing with search feature and new User Signed-off-by: Jaswinder Singh Signed-off-by: Galen Charlton --- .../lib/OpenILS/Application/EbookAPI/RBDigital.pm | 20 +++++++++++++++----- .../lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm | 4 ++-- .../opac/ebook_api/rbdigital/parts/filtersort.tt2 | 3 --- .../opac/ebook_api/rbdigital/register_modal.tt2 | 5 +++-- Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 | 7 +++---- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm index a3e582e5e0..21f4c5f392 100755 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm @@ -182,10 +182,7 @@ sub do_patron_auth { # try to authenticate the user with a username $patron_id = $self-> _get_patron_id($username); - if ($patron_id < 1) { - # TODO: Remove/Replace the below line - $patron_id = 99999; - } + $logger->error("EbookAPI: Unable to get RBDigital Patron ID found for $username/$email"); } return $patron_id; } @@ -291,6 +288,8 @@ sub _build_search_URI { if ($sort_by ne '') { $sort_string = "&sort-by=$sort_by&sort-order=$sort_order"; + } else { + $sort_string = '&sort-by=title'; #Default to Title sort } # convert book to ebook @@ -298,7 +297,7 @@ sub _build_search_URI { $media_format = 'ebook'; } - if ($media_format eq 'eaudio' || $media_format eq 'ebook') { + if ($media_format eq 'eaudio' || $media_format eq 'ebook' || $media_format eq '') { $uri = "search/$media_format?search-source=quick-all&page-size=$page_size". "&page-index=$page_index&all=$value_to_search&mediatype=$media_format".$sort_string; } elsif ($media_format eq '' && scalar (@$search_inputs) == 0) { @@ -810,6 +809,11 @@ sub get_patron_checkouts { my $session_id = $self->{session_id}; my $req; + if ($patron_id == 0) { + $logger->info("EbookAPI: Patron ID is 0. Returning with an API call"); + return; + } + $logger->info("EbookAPI: Getting checkout list for Patron: $patron_id from RBDigital."); $req = { method => 'GET', @@ -853,6 +857,12 @@ sub get_patron_holds { my $base_uri = $self->{base_uri}; my $library_id = $self->{library_id}; my $session_id = $self->{session_id}; + + if ($patron_id == 0) { + $logger->info("EbookAPI: Patron ID is 0. Returning with an API call"); + return; + } + my $req = { method => 'GET', uri => "$base_uri/libraries/$library_id/patrons/$patron_id/holds", diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm index 9011b3307b..c432060051 100755 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/RBDigitalSearch.pm @@ -229,7 +229,7 @@ sub load_rbdigital_results { $logger->info('EbookAPI: RBDigitalSearch Checking media type'); # Check if RBDigital can perform requested query - if ($media_format eq 'eaudio' || $media_format eq 'ebook' || $media_format eq 'book' || $media_format eq 'music' || $media_format eq '') { + if ($media_format eq 'eaudio' || $media_format eq 'ebook' || $media_format eq 'book' || $media_format eq 'music' || $media_format eq '' ) { $logger->info('EbookAPI: RBDigitalSearch Invoking search method'); $results = _search ($self->editor->authtoken, $session_id, @@ -360,7 +360,7 @@ sub _get_patron_id { return $api_request->recv->content; } - return 1; + return 0; } sub _get_ebook_session_id { diff --git a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/filtersort.tt2 b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/filtersort.tt2 index 596c82d002..577d09c379 100755 --- a/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/filtersort.tt2 +++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/parts/filtersort.tt2 @@ -18,7 +18,4 @@ - - - diff --git a/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 b/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 index e932ef8c62..ce74ae82f5 100755 --- a/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 +++ b/Open-ILS/src/templates/opac/ebook_api/rbdigital/register_modal.tt2 @@ -2,7 +2,6 @@ \ No newline at end of file diff --git a/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 b/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 index a0693ac4cc..64fedf77c9 100755 --- a/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 +++ b/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 @@ -20,9 +20,8 @@ - [% IF ctx.rbdigital_patron_id == 0 %] + [% IF ctx.rbdigital_patron_id == 0; %] - [%- INCLUDE 'opac/ebook_api/rbdigital/register_modal.tt2' %] - [% END;%] - + [% INCLUDE 'opac/ebook_api/rbdigital/register_modal.tt2'; %] + [% END; %] [% END; %] -- 2.11.0