From 95441d6eec9add0cfe3301b3f1ebe29bea56fed0 Mon Sep 17 00:00:00 2001 From: Christina Cortland Date: Tue, 7 Jan 2025 16:39:49 -0500 Subject: [PATCH] DACCESS-474 - Don't exclude worldcat url generation for lc_callnum searches --- .../app/views/catalog/_search_more.html.erb | 2 +- .../lib/blacklight_cornell/cornell_catalog.rb | 24 +++++-------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/blacklight-cornell/app/views/catalog/_search_more.html.erb b/blacklight-cornell/app/views/catalog/_search_more.html.erb index ac805c091..a16a9fb0b 100644 --- a/blacklight-cornell/app/views/catalog/_search_more.html.erb +++ b/blacklight-cornell/app/views/catalog/_search_more.html.erb @@ -1,4 +1,4 @@ -<% unless @response.total_count < 1 && !@expanded_results.nil? %> +<% unless @response.total_count < 1 || @expanded_results.nil? %>
Not finding what you want?

diff --git a/blacklight-cornell/lib/blacklight_cornell/cornell_catalog.rb b/blacklight-cornell/lib/blacklight_cornell/cornell_catalog.rb index 650902dfa..2cd817cda 100644 --- a/blacklight-cornell/lib/blacklight_cornell/cornell_catalog.rb +++ b/blacklight-cornell/lib/blacklight_cornell/cornell_catalog.rb @@ -139,25 +139,13 @@ def index @filters = params[:f] || [] end - @expanded_results = {} - ['worldcat'].each do |key| - @expanded_results [key] = { :count => 0 , :url => '' } - end - # Expand search only under certain conditions - tmp = BentoSearch::Results.new - if !(params[:search_field] == 'lc_callnum') - if expandable_search? - # DISCOVERYACCESS-6734 - skip entire worldcat search that was intended to provide a count for worldcat results - query = ( params[:qdisplay]?params[:qdisplay] : params[:q]).gsub(/&/, '%26') - key = :worldcat - source_results = { - :count => 1, - :url => BentoSearch.get_engine(key).configuration.link + query, - } - @expanded_results = {} - @expanded_results[key.to_s] = source_results - end + if expandable_search? + query = params[:q].gsub(/&/, '%26') + source_results = { :url => BentoSearch.get_engine(:worldcat).configuration.link + query } + @expanded_results = { 'worldcat' => source_results } + else + @expanded_results = { 'worldcat' => { :url => ENV['WORLDCAT_URL'] } } end @controller = self