From f5c13dd7cb16b47497b6c26b6ea05a4551c7ce5c Mon Sep 17 00:00:00 2001
From: Jaswinder Singh <Jaswinder.Singh0011@gmail.com>
Date: Thu, 19 Jul 2018 08:29:26 -0400
Subject: [PATCH] LP#1772680: Fixed search and other issues

Signed-off-by: Jaswinder Singh <jaswinder.singh0011@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm | 14 +++++++++++---
 Open-ILS/src/templates/opac/parts/vendor_tabs.tt2          |  7 +++++++
 2 files changed, 18 insertions(+), 3 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 d9977f52db..f851f7eed8 100755
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/EbookAPI/RBDigital.pm
@@ -247,7 +247,7 @@ sub do_basic_search {
     }
 
 	# Call local method to get URI for a request
-    $basic_search_uri = _build_search_URI($media_format, $value_to_search, $facets, $search_inputs, $sort_by, $sort_order, $page_index, $page_size);
+    $basic_search_uri = _build_search_URI($search_type, $media_format, $value_to_search, $facets, $search_inputs, $sort_by, $sort_order, $page_index, $page_size);
 
     $logger->info('EbookAPI: Calling the search API: '.$uri);
     if (TEST_QA) {
@@ -283,7 +283,7 @@ sub do_basic_search {
 }
 
 sub _build_search_URI {
-    my ($media_format, $value_to_search, $facets, $search_inputs, $sort_by, $sort_order, $page_index, $page_size) = @_;
+    my ($search_type, $media_format, $value_to_search, $facets, $search_inputs, $sort_by, $sort_order, $page_index, $page_size) = @_;
     my $uri = '';
     my $sort_string = '';
     
@@ -299,8 +299,16 @@ sub _build_search_URI {
     }
 
     if ($media_format eq 'eaudio' || $media_format eq 'ebook' || $media_format eq '') {
+        my $search_term = '';
+        if ($search_type eq 'author' || $search_type eq 'genre') {
+            $search_term = "&$search_type=$value_to_search";
+        } else {
+            $search_term = "&all=$value_to_search";
+        }
+
         $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;
+            "&page-index=$page_index".$search_term."&mediatype=$media_format".$sort_string;
+
     } elsif ($media_format eq '' && scalar (@$search_inputs) == 0) {
         $uri = "search?q=$value_to_search&page-size=$page_size".
             "&page-index=$page_index".$sort_string;
diff --git a/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2 b/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2
index 64fedf77c9..4df5006a80 100755
--- a/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2
+++ b/Open-ILS/src/templates/opac/parts/vendor_tabs.tt2
@@ -24,4 +24,11 @@
         <!-- Load Code for displaying the password prompt -->
         [% INCLUDE 'opac/ebook_api/rbdigital/register_modal.tt2'; %]
     [% END; %]
+[% ELSE; %]
+     <div id="vendor_tabs">
+        <div id="acct_tabs">
+                <a id="lnkSearchResults_default" 
+                    href="[% mkurl(ctx.opac_root _ "/results") %]" class="acct-tab-on">Evergreen</a>
+        </div>
+    </div>
 [% END; %]
-- 
2.11.0