Skip to content

Commit

Permalink
Merge pull request #92 from upenn-libraries/80_check_for_summon_error…
Browse files Browse the repository at this point in the history
…_state

explicitly check for error state in bento results from summon
  • Loading branch information
magibney authored Sep 30, 2020
2 parents 68ea0e4 + 0f47d19 commit 13da156
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

# required and confirmed in use
# TODO: switch back to official gem when PR #36 is accepted and makes it into a release
gem 'bento_search', git: 'https://github.com/magibney/bento_search', branch: 'search_controller_engine_params' #'1.7'
gem 'bento_search', git: 'https://github.com/upenn-libraries/bento_search', branch: 'search_controller_engine_params' #'1.7'
gem 'blacklight', '6.8.0', git: 'https://github.com/magibney/blacklight.git', branch: 'v6.8.0-solr7-qq-feedFormat'
gem 'blacklight-marc', '6.2.0'
gem 'blacklight-ris', git: 'https://github.com/upenn-libraries/blacklight-ris.git'
Expand Down
32 changes: 16 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
GIT
remote: https://github.com/magibney/bento_search
revision: af7c055b8ee0eed24c7fcf02e4fdab33b3e67bbe
branch: search_controller_engine_params
specs:
bento_search (1.8.0)
confstruct (~> 1.0)
htmlentities
httpclient (>= 2.2.5, < 3.0.0)
language_list (~> 1.0)
multi_json (>= 1.0.4, < 2.0)
nokogiri
openurl (>= 0.3.1, < 1.1)
rails (>= 3.2.3, < 6)
summon

GIT
remote: https://github.com/magibney/blacklight.git
revision: b8a2e5f823e7b8cca623e185fb53dc29c91aa825
Expand All @@ -37,6 +21,22 @@ GIT
summon (2.0.12)
json (~> 1.8)

GIT
remote: https://github.com/upenn-libraries/bento_search
revision: 3f45d1c286ae19146aa51dc7b54b5a5a6b7c3dd0
branch: search_controller_engine_params
specs:
bento_search (1.8.0)
confstruct (~> 1.0)
htmlentities
httpclient (>= 2.2.5, < 3.0.0)
language_list (~> 1.0)
multi_json (>= 1.0.4, < 2.0)
nokogiri
openurl (>= 0.3.1, < 1.1)
rails (>= 3.2.3, < 6)
summon

GIT
remote: https://github.com/upenn-libraries/blacklight-ris.git
revision: 88b4f1defc441c49d2408b3881ee4482b203eb7c
Expand Down
7 changes: 6 additions & 1 deletion app/views/layouts/_summon_ajax_results_wrapper.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<% if results.error %>
<%= 'Error processing remote request' %>
<% Honeybadger.notify "Error retrieving Summon results: #{results.error}" %>
<% else %>
<div class="view-and-filter text-right">
<%= link_to "View and filter #{number_with_delimiter(results.total_items)} #{results.total_items != 1 ? 'results' : 'result'}", summon_url(params[:q] || params[:query]) %>
</div>
Expand All @@ -13,4 +17,5 @@
<% end %>

<div class="corner left-bottom hide"></div>
<div class="corner right-bottom hide"></div>
<div class="corner right-bottom hide"></div>
<% end %>

0 comments on commit 13da156

Please sign in to comment.