From ede8f9351ae823fa260ed3d47c2e54decc2e8f08 Mon Sep 17 00:00:00 2001 From: Chris Clement Date: Fri, 11 Oct 2019 12:52:36 -0400 Subject: [PATCH 001/114] Bibs with a single holding and item descriptions automatically shows the items table --- app/assets/javascripts/availability.js.erb | 30 ++++++++++++--------- app/controllers/franklin_alma_controller.rb | 16 ++++++++--- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index ca108d2d..e3cf8db1 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -143,17 +143,23 @@ $(document).ready(function() { } var dataLen = json.data.length; - if(dataLen == 0) { - //$('#table-wrapper-' + mmsid).hide(); - } - // Reference: https://stackoverflow.com/a/15458987 - // Check if the location of the first holding is an HTML element, - // indicating this is for a serial - else if(/<[a-z][\s\S]*>/i.test(json.data[0][2])) { - $('#requestOptionsAvailability-' + mmsid).text('Holdings'); + if(dataLen > 0) { + // Reference: https://stackoverflow.com/a/15458987 + // Check if the location of the first holding is an HTML element, + // indicating this is for a serial + if(/<[a-z][\s\S]*>/i.test(json.data[0][2])) { + $('#requestOptionsAvailability-' + mmsid).text('Holdings'); + } + else { + $('#requestOptionsAvailability-' + mmsid).text('Availability'); + } } - else { - $('#requestOptionsAvailability-' + mmsid).text('Availability'); + else if(dataLen === undefined && !Array.isArray(json.data)) { + // Single holding case + var show_location = true; + loadItems(json.data.mmsid, json.data.holding_id, json.data.location_code, show_location); + $('.backbutton-top-' + mmsid).hide(); + $('.backbutton-' + mmsid).hide(); } $('.load-holding-details').each(function(idx, element) { @@ -341,11 +347,11 @@ $(document).ready(function() { ba.loadRequestOptions(); }); -function loadItems(mms_id, holding_id, location_code) { +function loadItems(mms_id, holding_id, location_code, show_location = false) { renderdata[mms_id] = []; var holdingItemsTable = $('#holdingItems-' + mms_id).DataTable(); holdingItemsTable.clear().draw(); - holdingItemsTable.ajax.url('/alma/holding_items.json?mms_id=' + mms_id + "&holding_id=" + holding_id + "¤t_location=" + location_code).load(); + holdingItemsTable.ajax.url('/alma/holding_items.json?mms_id=' + mms_id + "&holding_id=" + holding_id + "¤t_location=" + location_code + "&show_location=" + show_location).load(); swapDataTables(mms_id); } diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index a915198b..440417e2 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -264,6 +264,11 @@ def single_availability end end + if bib_data['availability'][mmsid]['holdings'].length() == 1 && has_holding_info + holding = bib_data['availability'][mmsid]['holdings'].first + table_data = {"mmsid": mmsid, "holding_id": holding['holding_id'], "location_code": holding['location_code']} + end + metadata[mmsid][:inventory_type] = inventory_type render :json => {"metadata": metadata, "data": table_data} end @@ -297,6 +302,7 @@ def check_requestable(has_holding_info = false) def holding_items userid = session['id'].presence || nil due_date_policy = 'Please log in for loan and request information' if userid.nil? + show_location = params.delete("show_location") == "true" api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] options = {:expand => 'due_date_policy', :offset => 0, :limit => 100, :user_id => userid, :order_by => 'description'} @@ -309,14 +315,18 @@ def holding_items policies = {} pids_to_check = [] - table_data = response_data['item'].map { |item| data = item['item_data'] + + location = show_location ? + "#{item['item_data']['location']['desc']}
#{item['holding_data']['call_number']}
" : + "" + unless(policies.has_key?(data['policy']['value']) || data['base_status']['desc'] != "Item in place" || userid.nil?) policies[data['policy']['value']] = nil pids_to_check << [data['pid'], data['policy']['value']] end - [data['policy']['value'], data['pid'], data['description'], data['base_status']['desc'], data['barcode'], due_date_policy || data['due_date_policy'], [], params['mms_id'], params['holding_id']] + [data['policy']['value'], data['pid'], location + data['description'], data['base_status']['desc'], data['barcode'], due_date_policy || data['due_date_policy'], [], params['mms_id'], params['holding_id']] } while options[:offset] + options[:limit] < response_data['total_record_count'] @@ -329,7 +339,7 @@ def holding_items policies[data['policy']['value']] = nil pids_to_check << [data['pid'], data['policy']['value']] end - [data['policy']['value'], data['pid'], data['description'], due_date_policy || data['due_date_policy'], data['base_status']['desc'], data['barcode'], [], params['mms_id'], params['holding_id']] + [data['policy']['value'], data['pid'], location + data['description'], due_date_policy || data['due_date_policy'], data['base_status']['desc'], data['barcode'], [], params['mms_id'], params['holding_id']] } end From 7bb2350b09d056284164d213b6ba966d4e11717f Mon Sep 17 00:00:00 2001 From: Chris Clement Date: Fri, 11 Oct 2019 13:52:37 -0400 Subject: [PATCH 002/114] Fixed HTML --- app/controllers/franklin_alma_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 440417e2..0b193a93 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -319,7 +319,7 @@ def holding_items data = item['item_data'] location = show_location ? - "#{item['item_data']['location']['desc']}
#{item['holding_data']['call_number']}
" : + "#{item['item_data']['location']['desc']}
#{item['holding_data']['call_number']}
" : "" unless(policies.has_key?(data['policy']['value']) || data['base_status']['desc'] != "Item in place" || userid.nil?) From 2ea432e53dc54cdbece9a1cb8ff7ed09c92c1632 Mon Sep 17 00:00:00 2001 From: Chris Clement Date: Fri, 11 Oct 2019 14:22:12 -0400 Subject: [PATCH 003/114] Fix to account for asset precompilation --- app/assets/javascripts/availability.js.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index e3cf8db1..128fb59f 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -347,8 +347,13 @@ $(document).ready(function() { ba.loadRequestOptions(); }); -function loadItems(mms_id, holding_id, location_code, show_location = false) { +function loadItems(mms_id, holding_id, location_code, show_location) { renderdata[mms_id] = []; + + // Reference: https://stackoverflow.com/a/35464024 + // This is needed so that asset precompilation doesn't fail + show_location = typeof show_location !== 'undefined' ? show_location : false; + var holdingItemsTable = $('#holdingItems-' + mms_id).DataTable(); holdingItemsTable.clear().draw(); holdingItemsTable.ajax.url('/alma/holding_items.json?mms_id=' + mms_id + "&holding_id=" + holding_id + "¤t_location=" + location_code + "&show_location=" + show_location).load(); From 589475e15ca01a268ae51cdb83a12d137f5c8a78 Mon Sep 17 00:00:00 2001 From: Chris Clement Date: Wed, 30 Oct 2019 14:19:20 -0400 Subject: [PATCH 004/114] Revert "Merge pull request #18 from upenn-libraries/single_holding_fix" This reverts commit d8655d51a37daea8ad8153ff1b3776564d54acb7, reversing changes made to e0d7298825b241ce691239be0291341269d576f2. --- app/assets/javascripts/availability.js.erb | 35 +++++++-------------- app/controllers/franklin_alma_controller.rb | 16 ++-------- 2 files changed, 15 insertions(+), 36 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index 128fb59f..ca108d2d 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -143,23 +143,17 @@ $(document).ready(function() { } var dataLen = json.data.length; - if(dataLen > 0) { - // Reference: https://stackoverflow.com/a/15458987 - // Check if the location of the first holding is an HTML element, - // indicating this is for a serial - if(/<[a-z][\s\S]*>/i.test(json.data[0][2])) { - $('#requestOptionsAvailability-' + mmsid).text('Holdings'); - } - else { - $('#requestOptionsAvailability-' + mmsid).text('Availability'); - } + if(dataLen == 0) { + //$('#table-wrapper-' + mmsid).hide(); + } + // Reference: https://stackoverflow.com/a/15458987 + // Check if the location of the first holding is an HTML element, + // indicating this is for a serial + else if(/<[a-z][\s\S]*>/i.test(json.data[0][2])) { + $('#requestOptionsAvailability-' + mmsid).text('Holdings'); } - else if(dataLen === undefined && !Array.isArray(json.data)) { - // Single holding case - var show_location = true; - loadItems(json.data.mmsid, json.data.holding_id, json.data.location_code, show_location); - $('.backbutton-top-' + mmsid).hide(); - $('.backbutton-' + mmsid).hide(); + else { + $('#requestOptionsAvailability-' + mmsid).text('Availability'); } $('.load-holding-details').each(function(idx, element) { @@ -347,16 +341,11 @@ $(document).ready(function() { ba.loadRequestOptions(); }); -function loadItems(mms_id, holding_id, location_code, show_location) { +function loadItems(mms_id, holding_id, location_code) { renderdata[mms_id] = []; - - // Reference: https://stackoverflow.com/a/35464024 - // This is needed so that asset precompilation doesn't fail - show_location = typeof show_location !== 'undefined' ? show_location : false; - var holdingItemsTable = $('#holdingItems-' + mms_id).DataTable(); holdingItemsTable.clear().draw(); - holdingItemsTable.ajax.url('/alma/holding_items.json?mms_id=' + mms_id + "&holding_id=" + holding_id + "¤t_location=" + location_code + "&show_location=" + show_location).load(); + holdingItemsTable.ajax.url('/alma/holding_items.json?mms_id=' + mms_id + "&holding_id=" + holding_id + "¤t_location=" + location_code).load(); swapDataTables(mms_id); } diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 0b193a93..a915198b 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -264,11 +264,6 @@ def single_availability end end - if bib_data['availability'][mmsid]['holdings'].length() == 1 && has_holding_info - holding = bib_data['availability'][mmsid]['holdings'].first - table_data = {"mmsid": mmsid, "holding_id": holding['holding_id'], "location_code": holding['location_code']} - end - metadata[mmsid][:inventory_type] = inventory_type render :json => {"metadata": metadata, "data": table_data} end @@ -302,7 +297,6 @@ def check_requestable(has_holding_info = false) def holding_items userid = session['id'].presence || nil due_date_policy = 'Please log in for loan and request information' if userid.nil? - show_location = params.delete("show_location") == "true" api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] options = {:expand => 'due_date_policy', :offset => 0, :limit => 100, :user_id => userid, :order_by => 'description'} @@ -315,18 +309,14 @@ def holding_items policies = {} pids_to_check = [] + table_data = response_data['item'].map { |item| data = item['item_data'] - - location = show_location ? - "#{item['item_data']['location']['desc']}
#{item['holding_data']['call_number']}
" : - "" - unless(policies.has_key?(data['policy']['value']) || data['base_status']['desc'] != "Item in place" || userid.nil?) policies[data['policy']['value']] = nil pids_to_check << [data['pid'], data['policy']['value']] end - [data['policy']['value'], data['pid'], location + data['description'], data['base_status']['desc'], data['barcode'], due_date_policy || data['due_date_policy'], [], params['mms_id'], params['holding_id']] + [data['policy']['value'], data['pid'], data['description'], data['base_status']['desc'], data['barcode'], due_date_policy || data['due_date_policy'], [], params['mms_id'], params['holding_id']] } while options[:offset] + options[:limit] < response_data['total_record_count'] @@ -339,7 +329,7 @@ def holding_items policies[data['policy']['value']] = nil pids_to_check << [data['pid'], data['policy']['value']] end - [data['policy']['value'], data['pid'], location + data['description'], due_date_policy || data['due_date_policy'], data['base_status']['desc'], data['barcode'], [], params['mms_id'], params['holding_id']] + [data['policy']['value'], data['pid'], data['description'], due_date_policy || data['due_date_policy'], data['base_status']['desc'], data['barcode'], [], params['mms_id'], params['holding_id']] } end From a77d4bb9ed47e155e4d25422a8fcb4d25b1e244a Mon Sep 17 00:00:00 2001 From: Katherine Schultz Date: Wed, 30 Oct 2019 15:14:57 -0400 Subject: [PATCH 005/114] edit FEATURED loc to add Moelis Lounge --- config/translation_maps/locations.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/translation_maps/locations.xml b/config/translation_maps/locations.xml index f19a5d7b..1cc79e7c 100644 --- a/config/translation_maps/locations.xml +++ b/config/translation_maps/locations.xml @@ -699,7 +699,7 @@ Van Pelt - Featured Books--First Floor Van Pelt-Dietrich Library Center - Van Pelt - Featured Books--First Floor + Van Pelt - Featured Books--First Floor, see also table near Moelis Lounge Fisher Fine Arts Library From 953934e82b407913d874cbb39d37b73980755e4a Mon Sep 17 00:00:00 2001 From: Chris Clement Date: Mon, 11 Nov 2019 16:29:48 -0500 Subject: [PATCH 006/114] Fixed data offset issue that was hiding 'Request' link for the 101st item onward --- app/controllers/franklin_alma_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index a915198b..1e36f7ea 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -329,7 +329,7 @@ def holding_items policies[data['policy']['value']] = nil pids_to_check << [data['pid'], data['policy']['value']] end - [data['policy']['value'], data['pid'], data['description'], due_date_policy || data['due_date_policy'], data['base_status']['desc'], data['barcode'], [], params['mms_id'], params['holding_id']] + [data['policy']['value'], data['pid'], data['description'], data['base_status']['desc'], data['barcode'], due_date_policy || data['due_date_policy'], [], params['mms_id'], params['holding_id']] } end From 42993936e41f0f0ddf8cc8176cc27ca0b286cdbf Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Thu, 5 Dec 2019 10:42:36 -0500 Subject: [PATCH 007/114] update collection news blog feed, per vallhonr --- app/controllers/collection_news_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/collection_news_controller.rb b/app/controllers/collection_news_controller.rb index 1e335094..a928c8f6 100644 --- a/app/controllers/collection_news_controller.rb +++ b/app/controllers/collection_news_controller.rb @@ -7,7 +7,7 @@ class CollectionNewsController < ApplicationController include RssProxy def index - rss_proxy('https://pennlibnews.wordpress.com/category/collection-news/feed/') + rss_proxy('http://www.library.upenn.edu/blogs/libraries-news/category/Collections/rss.xml') end end From 0ab8aae5978e57704a4d8ad187035ed7729475ce Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 9 Dec 2019 12:02:43 -0500 Subject: [PATCH 008/114] fix "More collection news" link; point to new blog --- app/views/catalog/_landing_bento.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/catalog/_landing_bento.html.erb b/app/views/catalog/_landing_bento.html.erb index 8f9f5047..73b0effb 100644 --- a/app/views/catalog/_landing_bento.html.erb +++ b/app/views/catalog/_landing_bento.html.erb @@ -49,7 +49,7 @@
-
More collection news...
+
More collection news...
From e8c65a1df956850e3180ae02813aece8d8b52d8a Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 23 Dec 2019 10:22:14 -0500 Subject: [PATCH 009/114] bookplates link to pantheon, not nebraska (per vallhonr) --- lib/penn_lib/marc.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb index 097ca5fa..7f364afa 100644 --- a/lib/penn_lib/marc.rb +++ b/lib/penn_lib/marc.rb @@ -2374,7 +2374,7 @@ def get_web_link_display(rec) .split(/\W+/) .select { |word| !words_to_remove_from_web_link.member?(word.downcase) } .join('') - imagesource = "//www.library.upenn.edu/images/alum/bookplates/#{imagename}.gif" + imagesource = "//www.library.upenn.edu/sites/default/files/images/bookplates/#{imagename}.gif" links << { img_src: imagesource, img_alt: "#{linktext} Bookplate", From ac153ad75e70571ef71143aab60b61352d749baf Mon Sep 17 00:00:00 2001 From: Katherine Schultz Date: Tue, 7 Jan 2020 15:45:26 -0500 Subject: [PATCH 010/114] create new loc Featured Books Display in MPA library --- config/translation_maps/locations.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/translation_maps/locations.xml b/config/translation_maps/locations.xml index 1cc79e7c..ec72be8a 100644 --- a/config/translation_maps/locations.xml +++ b/config/translation_maps/locations.xml @@ -877,6 +877,11 @@ Math/Physics/Astronomy Library Math/Physics/Astronomy - Circulation Desk + + Math/Physics/Astronomy Library - Featured Books Display + Math/Physics/Astronomy Library + Math/Physics/Astronomy Library - Featured Books Display + Math/Physics/Astronomy Library - New Book Shelf Math/Physics/Astronomy Library From 63b86e74c08bf32ac78ba707929fb3ff22a73a15 Mon Sep 17 00:00:00 2001 From: Chris Clement Date: Fri, 24 Jan 2020 11:11:22 -0500 Subject: [PATCH 011/114] Added test_access flag to correct eresource linking --- app/assets/javascripts/availability.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index ca108d2d..dee32edb 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -43,7 +43,7 @@ $(document).ready(function() { if (holding['activation_status'] == 'Available') { var url = null; if (holding['portfolio_pid']) { - url = "https://<%= ENV['ALMA_DELIVERY_DOMAIN'] %>/view/uresolver/<%= ENV['ALMA_INSTITUTION_CODE'] %>/openurl?Force_direct=true&portfolio_pid=" + + url = "https://<%= ENV['ALMA_DELIVERY_DOMAIN'] %>/view/uresolver/<%= ENV['ALMA_INSTITUTION_CODE'] %>/openurl?Force_direct=true&test_access=true&&portfolio_pid=" + holding['portfolio_pid'] + "&rfr_id=info%3Asid%2Fprimo.exlibrisgroup.com&u.ignore_date_coverage=true" } From 4e1331c79828c3451ab5919b99517b0f5e837af4 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Wed, 5 Feb 2020 09:52:52 -0500 Subject: [PATCH 012/114] update database a-z list url --- app/views/catalog/_home_text.html.erb | 2 +- app/views/catalog/_landing_articles.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/catalog/_home_text.html.erb b/app/views/catalog/_home_text.html.erb index bb2e685a..522ef21b 100644 --- a/app/views/catalog/_home_text.html.erb +++ b/app/views/catalog/_home_text.html.erb @@ -16,7 +16,7 @@
  • Use Penn   Text Article Finder to find content subscribed to by Penn Libraries.
    • -
  • Browse databases by subject.
    • +
  • Browse databases by subject.
  • Image collections.
    • diff --git a/app/views/catalog/_landing_articles.html.erb b/app/views/catalog/_landing_articles.html.erb index 2af70fa4..437d4581 100644 --- a/app/views/catalog/_landing_articles.html.erb +++ b/app/views/catalog/_landing_articles.html.erb @@ -14,7 +14,7 @@ From 659d581258d3ab2f24823364d5405d04cb570ba7 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Fri, 31 Jan 2020 13:48:37 -0500 Subject: [PATCH 013/114] add last-10-years publication date facet bucket --- app/models/franklin_indexer.rb | 2 +- lib/penn_lib/marc.rb | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/franklin_indexer.rb b/app/models/franklin_indexer.rb index 452c3039..d87278c1 100644 --- a/app/models/franklin_indexer.rb +++ b/app/models/franklin_indexer.rb @@ -354,7 +354,7 @@ def define_all_fields to_field 'publication_date_f_stored' do |rec, acc, ctx| val = ctx.clipboard.dig(:dates, :pub_date_decade) - acc << val if val + acc.concat(val.nil? ? [] : val) end to_field 'publication_dr' do |rec, acc, ctx| diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb index 7f364afa..56fb07e0 100644 --- a/lib/penn_lib/marc.rb +++ b/lib/penn_lib/marc.rb @@ -952,9 +952,17 @@ def build_dates_hash(raw_pub_date_start, raw_pub_date_end = nil, content_date = content_date_end = pub_date_end end end + if current_year + 15 > pub_date_start.to_i + pub_date_decade = [ pub_date_start[0,3] + '0s' ] + if current_year - pub_date_start.to_i < 10 || current_year - pub_date_end.to_i < 10 + pub_date_decade << 'Last 10 years' + end + else + pub_date_decade = nil + end { :pub_date_sort => pub_date_start, - :pub_date_decade => current_year + 15 > pub_date_start.to_i ? pub_date_start[0,3] + '0s' : nil, + :pub_date_decade => pub_date_decade, :pub_date_range => "[#{pub_date_start} TO #{pub_date_end}]", :content_date_range => "[#{content_date_start} TO #{content_date_end}]", :pub_date_minsort => "#{pub_date_start}-01-01T00:00:00Z", From 331259d1a91a4c168d95b51b4c1734f142867117 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Fri, 31 Jan 2020 13:49:13 -0500 Subject: [PATCH 014/114] filter out non-whitelisted "source specified" subject vocabs --- lib/penn_lib/marc.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb index 56fb07e0..9c3656bd 100644 --- a/lib/penn_lib/marc.rb +++ b/lib/penn_lib/marc.rb @@ -341,7 +341,10 @@ def subject_codes_to_xfacet_prefixes def is_subject_field(field) # 10/2018 kms: add 2nd Ind 7 - subject_codes.member?(field.tag) && %w(0 2 4 7).member?(field.indicator2) + subject_codes.member?(field.tag) && (%w(0 2 4).member?(field.indicator2) || + (field.indicator2 == '7' && field.any? do |sf| + sf.code == '2' && %w(aat cct fast jlabsh lcsh lcstt lctgm local/osu mesh ndlsh nlksh).member?(sf.value) + end)) end def reject_pro_chr(sf) From 3014f546875800a67732392a3526b76c8f2da207 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Fri, 31 Jan 2020 16:12:41 -0500 Subject: [PATCH 015/114] move "Penn Library Web" access facet to "Online library" location facet --- lib/penn_lib/marc.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb index 9c3656bd..b8a011c1 100644 --- a/lib/penn_lib/marc.rb +++ b/lib/penn_lib/marc.rb @@ -712,12 +712,12 @@ def get_prt_count(rec) end def get_access_values(rec) - acc = rec.flat_map do |f| + acc = rec.map do |f| case f.tag when EnrichedMarc::TAG_HOLDING 'At the library' when EnrichedMarc::TAG_ELECTRONIC_INVENTORY - ['Online', 'Penn Library Web'] + 'Online' end end.compact acc += rec.fields('856') @@ -879,7 +879,7 @@ def holdings_location_mappings(rec, display_fieldname) # we don't facet for 'web' which is the 'Penn Library Web' location used in Voyager. # this location should eventually go away completely with data cleanup in Alma. - rec.fields(tag).flat_map do |field| + acc = rec.fields(tag).flat_map do |field| results = field.find_all { |sf| sf.code == subfield_code } .select { |sf| sf.value != 'web' } .map { |sf| @@ -893,6 +893,10 @@ def holdings_location_mappings(rec, display_fieldname) # flatten multiple 'library' values results.select(&:present?).flatten end.uniq + if rec.fields(EnrichedMarc::TAG_ELECTRONIC_INVENTORY).any? + acc << 'Online library' + end + return acc end def get_library_values(rec) From 5a4c33ac9a1aef3f175fba4650788172d67400a0 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 24 Feb 2020 13:25:33 -0500 Subject: [PATCH 016/114] add separate "recently published" facet, based on actual date fields --- app/controllers/catalog_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 452f2871..7b08da33 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -312,7 +312,12 @@ def expire_session config.add_facet_field 'language_f', label: 'Language', limit: 5, collapse: false, solr_params: @@MINCOUNT config.add_facet_field 'library_f', label: 'Library', limit: 5, collapse: false, solr_params: @@MINCOUNT config.add_facet_field 'specific_location_f', label: 'Specific location', limit: 5, solr_params: @@MINCOUNT - config.add_facet_field 'publication_date_f', label: 'Publication date', limit: 5, collapse: false, solr_params: @@MINCOUNT + config.add_facet_field 'recently_published', label: 'Recently published', collapse: false, solr_params: @@MINCOUNT, :query => { + :last_5_years => { label: 'Last 5 years', fq: "pub_max_dtsort:[#{Date.current.year - 4}-01-01T00:00:00Z TO *]" }, + :last_10_years => { label: 'Last 10 years', fq: "pub_max_dtsort:[#{Date.current.year - 9}-01-01T00:00:00Z TO *]" }, + :last_15_years => { label: 'Last 15 years', fq: "pub_max_dtsort:[#{Date.current.year - 14}-01-01T00:00:00Z TO *]" }, + } + config.add_facet_field 'publication_date_f', label: 'Publication date', limit: 5, solr_params: @@MINCOUNT config.add_facet_field 'classification_f', label: 'Classification', limit: 5, collapse: false, solr_params: @@MINCOUNT config.add_facet_field 'genre_f', label: 'Form/Genre', limit: 5, solr_params: @@MINCOUNT config.add_facet_field 'recently_added_f', label: 'Recently added', solr_params: @@MINCOUNT, :query => { From 4cf004d2e2383e2a578b986ddc7ca0d13c7d009a Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 24 Feb 2020 13:42:37 -0500 Subject: [PATCH 017/114] Revert "add last-10-years publication date facet bucket" This reverts commit 659d581258d3ab2f24823364d5405d04cb570ba7. will be handled instead by specific "recently published" facet based on pub_max date field --- app/models/franklin_indexer.rb | 2 +- lib/penn_lib/marc.rb | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/models/franklin_indexer.rb b/app/models/franklin_indexer.rb index d87278c1..452c3039 100644 --- a/app/models/franklin_indexer.rb +++ b/app/models/franklin_indexer.rb @@ -354,7 +354,7 @@ def define_all_fields to_field 'publication_date_f_stored' do |rec, acc, ctx| val = ctx.clipboard.dig(:dates, :pub_date_decade) - acc.concat(val.nil? ? [] : val) + acc << val if val end to_field 'publication_dr' do |rec, acc, ctx| diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb index b8a011c1..9555b41f 100644 --- a/lib/penn_lib/marc.rb +++ b/lib/penn_lib/marc.rb @@ -959,17 +959,9 @@ def build_dates_hash(raw_pub_date_start, raw_pub_date_end = nil, content_date = content_date_end = pub_date_end end end - if current_year + 15 > pub_date_start.to_i - pub_date_decade = [ pub_date_start[0,3] + '0s' ] - if current_year - pub_date_start.to_i < 10 || current_year - pub_date_end.to_i < 10 - pub_date_decade << 'Last 10 years' - end - else - pub_date_decade = nil - end { :pub_date_sort => pub_date_start, - :pub_date_decade => pub_date_decade, + :pub_date_decade => current_year + 15 > pub_date_start.to_i ? pub_date_start[0,3] + '0s' : nil, :pub_date_range => "[#{pub_date_start} TO #{pub_date_end}]", :content_date_range => "[#{content_date_start} TO #{content_date_end}]", :pub_date_minsort => "#{pub_date_start}-01-01T00:00:00Z", From 5f712a9082a28676342242e095075a88d468fcf6 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 24 Feb 2020 13:44:18 -0500 Subject: [PATCH 018/114] also whitelist subject display terms where source thesaurus specified --- lib/penn_lib/marc.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb index 9555b41f..699debdb 100644 --- a/lib/penn_lib/marc.rb +++ b/lib/penn_lib/marc.rb @@ -506,7 +506,9 @@ def get_subjects_from_600s_and_800(rec, indicator2) acc += rec.fields .select { |f| subject_600s.member?(f.tag) || (f.tag == '880' && has_subfield6_value(f, /^(#{subject_600s.join('|')})/)) } - .select { |f| f.indicator2 == indicator2 || (f.indicator2 == '7' && indicator2 == '0') } + .select { |f| f.indicator2 == indicator2 || (f.indicator2 == '7' && indicator2 == '0' && f.any? do |sf| + sf.code == '2' && %w(aat cct fast jlabsh lcsh lcstt lctgm local/osu mesh ndlsh nlksh).member?(sf.value) + end)} .map do |field| #added 2017/04/10: filter out 0 (authority record numbers) added by Alma value_for_link = join_subfields(field, &subfield_not_in(%w{0 6 8 2 e w})) From adf610c007817f9a177d1f91953df1fdf5605a52 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 24 Feb 2020 14:08:05 -0500 Subject: [PATCH 019/114] prevent duplicate subjects from being displayed no differentiation in source/type/ontology for now; they're just strings, linked/searched as strings, so there is no point whatsoever in duplicating them for display. --- lib/penn_lib/marc.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb index 699debdb..a767eb8c 100644 --- a/lib/penn_lib/marc.rb +++ b/lib/penn_lib/marc.rb @@ -499,6 +499,7 @@ def subject_69X # 11/2018: add 69x as local subj, add 650 _7 as subj def get_subjects_from_600s_and_800(rec, indicator2) + track_dups = Set.new acc = [] if %w{0 1 2}.member?(indicator2) #Subjects, Childrens subjects, and Medical Subjects all share this code @@ -527,7 +528,7 @@ def get_subjects_from_600s_and_800(rec, indicator2) link_type: 'subject_xfacet2' } end - end.compact + end.compact.select { |val| track_dups.add?(val) } elsif indicator2 == '4' # Local subjects # either a tag in subject_600s list with ind2==4, or a tag in subject_69X list with any ind2. @@ -557,7 +558,7 @@ def get_subjects_from_600s_and_800(rec, indicator2) link_type: 'subject_search' } end - end.compact + end.compact.select { |val| track_dups.add?(val) } end acc end From 805fc230ecad8de5aa42707c0421806f57a9346e Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 24 Feb 2020 14:15:43 -0500 Subject: [PATCH 020/114] add top-level catch-all "Veterinary" library alias --- config/translation_maps/locations.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/config/translation_maps/locations.xml b/config/translation_maps/locations.xml index ec72be8a..f57d9321 100644 --- a/config/translation_maps/locations.xml +++ b/config/translation_maps/locations.xml @@ -1031,18 +1031,21 @@ Veterinary: du Pont Library (New Bolton) Health Sciences Libraries + Veterinary Veterinary: du Pont Library (New Bolton) Veterinary: du Pont Library (New Bolton) Veterinary: du Pont Library (New Bolton) - Circulation Desk Health Sciences Libraries + Veterinary Veterinary: du Pont Library (New Bolton) Veterinary: du Pont Library (New Bolton) - Circulation Desk Veterinary: du Pont Library (New Bolton) - Office Health Sciences Libraries + Veterinary Veterinary: du Pont Library (New Bolton) Veterinary: du Pont Library (New Bolton) - Office @@ -1056,12 +1059,14 @@ Veterinary: du Pont Library (New Bolton) - Reference Health Sciences Libraries + Veterinary Veterinary: du Pont Library (New Bolton) Veterinary: du Pont Library (New Bolton) - Reference Veterinary: du Pont Library (New Bolton) - Reserve Health Sciences Libraries + Veterinary Veterinary: du Pont Library (New Bolton) Reserve Veterinary: du Pont Library (New Bolton) - Reserve @@ -1131,6 +1136,7 @@ On Order Health Sciences Libraries + Veterinary Veterinary: du Pont Library (New Bolton) Ordered for New Bolton Library @@ -1152,6 +1158,7 @@ On Order Health Sciences Libraries + Veterinary Ordered for Veterinary: Atwood Library (Campus) @@ -1745,42 +1752,49 @@ Veterinary: Atwood Library (Campus) Health Sciences Libraries + Veterinary Veterinary: Atwood Library (Campus) Veterinary: Atwood Library (Campus) Veterinary: Atwood Library (Campus) - Display Health Sciences Libraries + Veterinary Veterinary: Atwood Library (Campus) Veterinary: Atwood Library (Campus) - Display Veterinary: Atwood Library (Campus) - Librarian's Office Health Sciences Libraries + Veterinary Veterinary: Atwood Library (Campus) Veterinary: Atwood Library (Campus) - Librarian's Office Veterinary: Atwood Library (Campus) - Oversize Health Sciences Libraries + Veterinary Veterinary: Atwood Library (Campus) Veterinary: Atwood Library (Campus) - Oversize Veterinary: Atwood Library (Campus) - Reference Health Sciences Libraries + Veterinary Veterinary: Atwood Library (Campus) Veterinary: Atwood Library (Campus) - Reference Veterinary: Atwood Library (Campus) - Reference Oversize Health Sciences Libraries + Veterinary Veterinary: Atwood Library (Campus) Veterinary: Atwood Library (Campus) - Reference Oversize Veterinary: Atwood Library (Campus) - Reserve Health Sciences Libraries + Veterinary Veterinary: Atwood Library (Campus) Reserve Veterinary: Atwood Library (Campus) - Reserve @@ -1788,6 +1802,7 @@ Veterinary: Atwood Library (Campus) - Reserve Oversize Health Sciences Libraries + Veterinary Veterinary: Atwood Library (Campus) Reserve Veterinary: Atwood Library (Campus) - Reserve Oversize From b780c4f0b0bdb455690ded7ccfb8517d27658844 Mon Sep 17 00:00:00 2001 From: Chris Clement Date: Mon, 16 Mar 2020 11:25:51 -0400 Subject: [PATCH 021/114] Removed linking to physical item services --- app/assets/javascripts/availability.js.erb | 11 ++++-- app/controllers/franklin_alma_controller.rb | 40 +++++++++++---------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index dee32edb..2aa3e74f 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -14,6 +14,9 @@ $(document).ready(function() { } function constructAeonLink(mmsid, holding) { + // TODO: remove this line once the libraries are open again + return null; + if(holding['link_to_aeon']) { return 'Request to view'; } @@ -113,7 +116,9 @@ $(document).ready(function() { var requests = globaldata[data[i][7]]; if(validRequestTypes.indexOf(requests[0]) != -1) { renderdata[mmsid].push(data[i][7]); - data[i][5][0] = "Request"; +// TODO: Uncomment when libraries reopen + //data[i][5][0] = "Request"; + data[i][5][0] = ""; table.row(i).invalidate().draw(); } } @@ -294,7 +299,9 @@ $(document).ready(function() { var requests = globaldata[data[i][0]]; if(validRequestTypes.indexOf(requests[0]) != -1) { renderdata[mmsid].push(data[i][0]); - data[i][5].push("Request"); +// TODO: Uncomment when libraries reopen + //data[i][5].push("Request"); + data[i][5].push(""); table.row(i).invalidate().draw(); } } diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 1e36f7ea..78c670ec 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -218,7 +218,8 @@ def single_availability else bib_data['availability'][mmsid]['holdings'].each do |holding| links = [] - links << "Request to view in reading room" if holding['link_to_aeon'] +# TODO: Uncomment when libraries reopen + #links << "Request to view in reading room" if holding['link_to_aeon'] holding['availability'] = availability_status[holding['availability']] || 'Requestable' if has_holding_info @@ -345,11 +346,12 @@ def holding_items end policies[policy] = "/alma/request/?mms_id=%{mms_id}&holding_id=%{holding_id}&item_pid=%{item_pid}" unless not_requestable } - table_data.each { |item| policy = item.shift() request_url = (policies[policy] || '') % params.merge({:item_pid => item[0]}) - item[5] << "Request" unless (request_url.empty? || item[2] != 'Item in place') +# TODO: Uncomment when libraries reopen + #item[5] << "Request" unless (request_url.empty? || item[2] != 'Item in place') + item[5] << "" unless (request_url.empty? || item[2] != 'Item in place') } render :json => {"data": table_data} @@ -371,15 +373,16 @@ def request_options nil else case option['type']['value'] - when 'HOLD' - { - :option_name => 'Request', - #:option_url => option['request_url'], - :option_url => "/alma/request?mms_id=#{params['mms_id']}", - :avail_for_physical => true, - :avail_for_electronic => true, - :highlightable => true - } +# TODO: Uncomment when libraries reopen + #when 'HOLD' + #{ + #:option_name => 'Request', + ##:option_url => option['request_url'], + #:option_url => "/alma/request?mms_id=#{params['mms_id']}", + #:avail_for_physical => true, + #:avail_for_electronic => true, + #:highlightable => true + #} when 'GES' option_url = option['request_url'] if option_url.index('?') @@ -434,12 +437,13 @@ def request_options end } - results.append({ - :option_name => "Books By Mail", - :option_url => "https://franklin.library.upenn.edu/redir/booksbymail?bibid=#{params['mms_id']}", - :avail_for_physical => true, - :avail_for_electronic => false - }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(session['user_group']) +# TODO: Uncomment when libraries reopen + #results.append({ + #:option_name => "Books By Mail", + #:option_url => "https://franklin.library.upenn.edu/redir/booksbymail?bibid=#{params['mms_id']}", + #:avail_for_physical => true, + #:avail_for_electronic => false + #}) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(session['user_group']) render :json => results end From 15470ae20468eeae15fcf6b82525b7bf84bcce89 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Tue, 24 Mar 2020 12:42:42 -0400 Subject: [PATCH 022/114] removed call to deprecated franklin_alerts, per ivangold --- app/views/shared/_footer.html.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index a8c212b6..cdc932e5 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -91,5 +91,3 @@ - - From 10388a0b90ac7537ca81b846abf9aefdaf029218 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Tue, 24 Mar 2020 12:46:29 -0400 Subject: [PATCH 023/114] hotfix: only proxy "View and filter" link when user has proxy-equivalent auth --- app/assets/javascripts/login-ezproxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/login-ezproxy.js b/app/assets/javascripts/login-ezproxy.js index 140ac3eb..53a36ca0 100644 --- a/app/assets/javascripts/login-ezproxy.js +++ b/app/assets/javascripts/login-ezproxy.js @@ -45,7 +45,7 @@ $(document).ready(function() { var proxyUrl = PROXY_PREPEND + 'http://127.0.0.1:8082/?redirect=' + encodeURIComponent(currentUrl); $(div).find(".ezproxy-login-link").attr("href", proxyUrl); - if (auth !== null && auth !== undefined) { + if (auth !== null && auth !== undefined && auth.loggedIn) { $(div).find(".view-and-filter").find("a").each(function (idx, element) { // ezproxy handles url param specifically so we don't need to escape it var viewAndFilterUrl = $(element).attr("href"); From 461857289a4c83c1fa1334044ab7c74fa8fbdef0 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Wed, 25 Mar 2020 16:47:32 -0400 Subject: [PATCH 024/114] temporarily add links to hathi records corresponding to local holdings --- app/controllers/catalog_controller.rb | 6 +++--- app/helpers/document_render_helper.rb | 15 ++++++++++++++- app/views/catalog/_show_expanded.html.erb | 4 ++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 7b08da33..d1994175 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -134,7 +134,7 @@ def expire_session 'facet.mincount': 0, # fq: '{!tag=cluster}{!collapse field=cluster_id nullPolicy=expand size=5000000 min=record_source_id}', # this approach needs expand.field=cluster_id - fq: %q~{!tag=cluster}NOT ({!join from=cluster_id to=cluster_id v='record_source_f:"Penn"'} AND record_source_f:"HathiTrust")~, + fq: %q~{!tag=cluster}NOT ({!join from=cluster_id to=cluster_id v='record_source_f:"Penn"'} AND record_source_f:"HathiTrust") NOT record_source_id:3~, expand: 'true', 'expand.field': 'cluster_id', 'expand.q': '*:*', @@ -298,11 +298,11 @@ def expire_session 'Other' => { :label => 'Other', :fq => "{!tag=azlist ex=azlist}title_xfacet:/[ -`{-~].*/"} } config.add_facet_field 'access_f', label: 'Access', collapse: false, solr_params: @@MINCOUNT, query: { - 'Online' => { :label => 'Online', :fq => "{!join from=cluster_id to=cluster_id v='{!term f=access_f v=\\'Online\\'}'}"}, + 'Online' => { :label => 'Online', :fq => "{!join from=cluster_id to=cluster_id v='access_f:Online OR record_source_id:3'}"}, 'At the library' => { :label => 'At the library', :fq => "{!join from=cluster_id to=cluster_id v='{!term f=access_f v=\\'At the library\\'}'}"} } config.add_facet_field 'record_source_f', label: 'Record Source', collapse: false, solr_params: @@MINCOUNT, query: { - 'HathiTrust' => { :label => 'HathiTrust', :fq => "{!join from=cluster_id to=cluster_id v='{!term f=record_source_f v=\\'HathiTrust\\'}'}"}, + 'HathiTrust' => { :label => 'HathiTrust', :fq => "{!join from=cluster_id to=cluster_id v='{!terms f=record_source_id v=2,3}'}"}, 'Penn' => { :label => 'Penn', :fq => "{!join from=cluster_id to=cluster_id v='{!term f=record_source_f v=\\'Penn\\'}'}"} } config.add_facet_field 'format_f', label: 'Format', limit: 5, collapse: false, solr_params: @@MINCOUNT diff --git a/app/helpers/document_render_helper.rb b/app/helpers/document_render_helper.rb index 48ef5657..77ca4e63 100644 --- a/app/helpers/document_render_helper.rb +++ b/app/helpers/document_render_helper.rb @@ -51,12 +51,20 @@ def render_electronic_holdings_links(electronic_holdings_str) end end + @@HATHI_TMP_TEXT = 'HathiTrust Digital Library Login for full text' + @@HATHI_REPLACEMENT_TEXT = 'COVID-19 Special Access from HathiTrust — Login for full text' + @@HATHI_LOGIN_PREFIX = 'https://babel.hathitrust.org/Shibboleth.sso/Login?entityID=https://idp.pennkey.upenn.edu/idp/shibboleth&target=https%3A%2F%2Fbabel.hathitrust.org%2Fcgi%2Fping%2Fpong%3Ftarget%3D' + def render_online_resource_display_for_index_view(options) values = options[:value] values.map do |value| JSON.parse(value).map do |link_struct| url = link_struct['linkurl'] text = link_struct['linktext'] + if text == @@HATHI_TMP_TEXT + text = @@HATHI_REPLACEMENT_TEXT + url = @@HATHI_LOGIN_PREFIX + URI.encode_www_form_component(url) + end %Q{#{text}} end.join('
    ') end.join('
    ').html_safe @@ -69,11 +77,16 @@ def render_online_display_for_show_view(options) JSON.parse(value).map do |link_struct| url = link_struct['linkurl'] text = link_struct['linktext'] + orig_url = url + if text == @@HATHI_TMP_TEXT + text = @@HATHI_REPLACEMENT_TEXT + url = @@HATHI_LOGIN_PREFIX + URI.encode_www_form_component(url) + end html = %Q{
    #{text}} html += '
    '.html_safe if !text.start_with?('http') - html += + url + html += + orig_url end if link_struct['volumes'] diff --git a/app/views/catalog/_show_expanded.html.erb b/app/views/catalog/_show_expanded.html.erb index ded9f117..413325c0 100644 --- a/app/views/catalog/_show_expanded.html.erb +++ b/app/views/catalog/_show_expanded.html.erb @@ -1,4 +1,4 @@ -<% if document.expanded_docs.size > 0 %> +<% if document.expanded_docs.select { |doc| !doc.id.start_with?('HATHIALL_') }.size > 0 %>
    Other records:
    @@ -7,7 +7,7 @@
    From 1f6dcc24312c284b04a3eb94ba07e8c7aae711b6 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 13 Apr 2020 09:51:03 -0400 Subject: [PATCH 025/114] remove VIVO from "Other resources", per baowei --- app/views/catalog/_landing_bento.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/catalog/_landing_bento.html.erb b/app/views/catalog/_landing_bento.html.erb index 73b0effb..c9eee0fc 100644 --- a/app/views/catalog/_landing_bento.html.erb +++ b/app/views/catalog/_landing_bento.html.erb @@ -17,7 +17,6 @@
  • PennText Article Finder
  • Research guides
  • ScholarlyCommons
    • -
  • VIVO
  • WorldCat
  • From 1dc88a3d8239fd8d870dc677ae056151836d71cd Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Tue, 21 Apr 2020 15:46:29 -0400 Subject: [PATCH 026/114] clarify patron classes authorized for Hathi COVID-19 special access --- app/helpers/document_render_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/document_render_helper.rb b/app/helpers/document_render_helper.rb index 77ca4e63..e9159e3e 100644 --- a/app/helpers/document_render_helper.rb +++ b/app/helpers/document_render_helper.rb @@ -52,7 +52,7 @@ def render_electronic_holdings_links(electronic_holdings_str) end @@HATHI_TMP_TEXT = 'HathiTrust Digital Library Login for full text' - @@HATHI_REPLACEMENT_TEXT = 'COVID-19 Special Access from HathiTrust — Login for full text' + @@HATHI_REPLACEMENT_TEXT = 'COVID-19 Special Access from HathiTrust — Full text access only for students, active faculty, and permanent staff' @@HATHI_LOGIN_PREFIX = 'https://babel.hathitrust.org/Shibboleth.sso/Login?entityID=https://idp.pennkey.upenn.edu/idp/shibboleth&target=https%3A%2F%2Fbabel.hathitrust.org%2Fcgi%2Fping%2Fpong%3Ftarget%3D' def render_online_resource_display_for_index_view(options) From 718978552787cd623d9b04972f0414e39c114804 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Wed, 6 May 2020 16:54:50 -0400 Subject: [PATCH 027/114] link to details regarding Hathi ETAS access authorization --- app/helpers/document_render_helper.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/helpers/document_render_helper.rb b/app/helpers/document_render_helper.rb index e9159e3e..82ef3687 100644 --- a/app/helpers/document_render_helper.rb +++ b/app/helpers/document_render_helper.rb @@ -52,7 +52,8 @@ def render_electronic_holdings_links(electronic_holdings_str) end @@HATHI_TMP_TEXT = 'HathiTrust Digital Library Login for full text' - @@HATHI_REPLACEMENT_TEXT = 'COVID-19 Special Access from HathiTrust — Full text access only for students, active faculty, and permanent staff' + @@HATHI_REPLACEMENT_TEXT = 'COVID-19 Special Access from HathiTrust' + @@HATHI_INFO = ' — Full text access only for students, active faculty, and permanent staff' @@HATHI_LOGIN_PREFIX = 'https://babel.hathitrust.org/Shibboleth.sso/Login?entityID=https://idp.pennkey.upenn.edu/idp/shibboleth&target=https%3A%2F%2Fbabel.hathitrust.org%2Fcgi%2Fping%2Fpong%3Ftarget%3D' def render_online_resource_display_for_index_view(options) @@ -61,11 +62,13 @@ def render_online_resource_display_for_index_view(options) JSON.parse(value).map do |link_struct| url = link_struct['linkurl'] text = link_struct['linktext'] + append = '' if text == @@HATHI_TMP_TEXT text = @@HATHI_REPLACEMENT_TEXT url = @@HATHI_LOGIN_PREFIX + URI.encode_www_form_component(url) + append = @@HATHI_INFO end - %Q{#{text}} + %Q{#{text}#{append}} end.join('
    ') end.join('
    ').html_safe end @@ -77,12 +80,14 @@ def render_online_display_for_show_view(options) JSON.parse(value).map do |link_struct| url = link_struct['linkurl'] text = link_struct['linktext'] + append = '' orig_url = url if text == @@HATHI_TMP_TEXT text = @@HATHI_REPLACEMENT_TEXT url = @@HATHI_LOGIN_PREFIX + URI.encode_www_form_component(url) + append = @@HATHI_INFO end - html = %Q{
    #{text}} + html = %Q{
    #{text}#{append}} html += '
    '.html_safe if !text.start_with?('http') From bdc6de4559f4aa293ccdbe2b9d906b08b34ffa86 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Fri, 15 May 2020 15:41:05 -0400 Subject: [PATCH 028/114] cast wider net in getting publication display (include 880s, all 264 2ind=1) --- app/models/solr_document.rb | 6 +----- lib/penn_lib/marc.rb | 10 +--------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb index 8dfed0d1..68cc2677 100644 --- a/app/models/solr_document.rb +++ b/app/models/solr_document.rb @@ -92,11 +92,7 @@ def pennlibmarc def publication_display @publication_display ||= begin - values = pennlibmarc.get_publication_display(to_marc) - if pennlibmarc.has_264_with_a_or_b(to_marc) - values.concat(fetch('publication_a')) - end - values + pennlibmarc.get_publication_display(to_marc) end end diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb index a767eb8c..95203b6b 100644 --- a/lib/penn_lib/marc.rb +++ b/lib/penn_lib/marc.rb @@ -839,18 +839,10 @@ def get_publication_display(rec) .each do |field| acc << join_subfields(field, &subfield_in(['f'])) end + acc += get_264_or_880_fields(rec, '1') acc.select(&:present?) end - # used to determine whether to include faceted publication values - # as part of record display - def has_264_with_a_or_b(rec) - rec.fields('264') - .select { |f| f.indicator2 == '1' } - .take(1) - .any? { |f| f.any?(&subfield_in(%w{a b})) } - end - def get_language_values(rec) rec.fields('008').map do |field| lang_code = field.value[35..37] From 6bbb7515c265da8957a24e64341f03d4fbbcf896 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Fri, 15 May 2020 16:03:43 -0400 Subject: [PATCH 029/114] superfluous; implicitly falls back to pennlibmarc.get_publication_display --- app/models/solr_document.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb index 68cc2677..7399dce6 100644 --- a/app/models/solr_document.rb +++ b/app/models/solr_document.rb @@ -90,12 +90,6 @@ def pennlibmarc @pennlibmarc ||= PennLib::Marc.new(@code_mappings) end - def publication_display - @publication_display ||= begin - pennlibmarc.get_publication_display(to_marc) - end - end - def format_display @format_display ||= [ fetch('format_a') ] + pennlibmarc.get_format_display(to_marc) end From 5a8fa8d54301f866750bc63c04f07c77d82d27a3 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Fri, 15 May 2020 16:06:59 -0400 Subject: [PATCH 030/114] bugfix: inverted subfield exclusion in 880 series display --- lib/penn_lib/marc.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb index 95203b6b..404e9116 100644 --- a/lib/penn_lib/marc.rb +++ b/lib/penn_lib/marc.rb @@ -1676,7 +1676,7 @@ def get_series_display(rec) rec.fields('880') .select { |f| has_subfield6_value(f, /^(800|810|811|830|400|410|411|440|490)/) } .each do |field| - series = join_subfields(field, &subfield_in(%w{5 6 8})) + series = join_subfields(field, &subfield_not_in(%W{5 6 8})) acc << { value: series, link: false } end From 87545675b7236525c3dc249694e5ca4bb8760322 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Sun, 5 Jul 2020 23:13:52 -0400 Subject: [PATCH 031/114] Revert "Removed linking to physical item services" This reverts commit b780c4f0b0bdb455690ded7ccfb8517d27658844. Leaves us with a clean slate of changes against pre-COVID master --- app/assets/javascripts/availability.js.erb | 11 ++---- app/controllers/franklin_alma_controller.rb | 40 ++++++++++----------- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index 2aa3e74f..dee32edb 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -14,9 +14,6 @@ $(document).ready(function() { } function constructAeonLink(mmsid, holding) { - // TODO: remove this line once the libraries are open again - return null; - if(holding['link_to_aeon']) { return 'Request to view'; } @@ -116,9 +113,7 @@ $(document).ready(function() { var requests = globaldata[data[i][7]]; if(validRequestTypes.indexOf(requests[0]) != -1) { renderdata[mmsid].push(data[i][7]); -// TODO: Uncomment when libraries reopen - //data[i][5][0] = "Request"; - data[i][5][0] = ""; + data[i][5][0] = "Request"; table.row(i).invalidate().draw(); } } @@ -299,9 +294,7 @@ $(document).ready(function() { var requests = globaldata[data[i][0]]; if(validRequestTypes.indexOf(requests[0]) != -1) { renderdata[mmsid].push(data[i][0]); -// TODO: Uncomment when libraries reopen - //data[i][5].push("Request"); - data[i][5].push(""); + data[i][5].push("Request"); table.row(i).invalidate().draw(); } } diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 78c670ec..1e36f7ea 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -218,8 +218,7 @@ def single_availability else bib_data['availability'][mmsid]['holdings'].each do |holding| links = [] -# TODO: Uncomment when libraries reopen - #links << "Request to view in reading room" if holding['link_to_aeon'] + links << "Request to view in reading room" if holding['link_to_aeon'] holding['availability'] = availability_status[holding['availability']] || 'Requestable' if has_holding_info @@ -346,12 +345,11 @@ def holding_items end policies[policy] = "/alma/request/?mms_id=%{mms_id}&holding_id=%{holding_id}&item_pid=%{item_pid}" unless not_requestable } + table_data.each { |item| policy = item.shift() request_url = (policies[policy] || '') % params.merge({:item_pid => item[0]}) -# TODO: Uncomment when libraries reopen - #item[5] << "Request" unless (request_url.empty? || item[2] != 'Item in place') - item[5] << "" unless (request_url.empty? || item[2] != 'Item in place') + item[5] << "Request" unless (request_url.empty? || item[2] != 'Item in place') } render :json => {"data": table_data} @@ -373,16 +371,15 @@ def request_options nil else case option['type']['value'] -# TODO: Uncomment when libraries reopen - #when 'HOLD' - #{ - #:option_name => 'Request', - ##:option_url => option['request_url'], - #:option_url => "/alma/request?mms_id=#{params['mms_id']}", - #:avail_for_physical => true, - #:avail_for_electronic => true, - #:highlightable => true - #} + when 'HOLD' + { + :option_name => 'Request', + #:option_url => option['request_url'], + :option_url => "/alma/request?mms_id=#{params['mms_id']}", + :avail_for_physical => true, + :avail_for_electronic => true, + :highlightable => true + } when 'GES' option_url = option['request_url'] if option_url.index('?') @@ -437,13 +434,12 @@ def request_options end } -# TODO: Uncomment when libraries reopen - #results.append({ - #:option_name => "Books By Mail", - #:option_url => "https://franklin.library.upenn.edu/redir/booksbymail?bibid=#{params['mms_id']}", - #:avail_for_physical => true, - #:avail_for_electronic => false - #}) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(session['user_group']) + results.append({ + :option_name => "Books By Mail", + :option_url => "https://franklin.library.upenn.edu/redir/booksbymail?bibid=#{params['mms_id']}", + :avail_for_physical => true, + :avail_for_electronic => false + }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(session['user_group']) render :json => results end From a3e83dda29a0404525d530fca5678b895c302c4e Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Sun, 5 Jul 2020 23:17:43 -0400 Subject: [PATCH 032/114] initial changes to support pickup@penn; also reintroduces disabling of some services --- app/assets/javascripts/availability.js.erb | 54 ++++++++++++++++++++- app/controllers/franklin_alma_controller.rb | 15 ++++-- app/helpers/document_render_helper.rb | 48 +++++++++++++++--- 3 files changed, 103 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index dee32edb..39b64341 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -13,7 +13,53 @@ $(document).ready(function() { BlacklightAlma.call(this); } + // Hackily parses relevant context out of the DOM for the specified mmsid + function get_request_context(mmsid) { + var record_root = $('#doc_franklin_'+mmsid); + if (record_root.length == 0) { + record_root = $('#documents > div.document').has('div.documentHeader > h3.index_title a[href $= "_'+mmsid+'"]'); + } + var avail_jq_node = record_root.find('.availability-ajax-loaded[data-availability-ids='+mmsid+']') + var available = false; + avail_jq_node.contents().each(function() { + if (this.nodeType === 3 && $.trim(this.nodeValue).startsWith('Available')) { + available = true; + return false; // there's at least one "Available", so return early + } + }); + var full_text_links = record_root.find('dd.blacklight-full_text_links_for_cluster_display a'); + var hathi_pd = false; + var hathi_etas = false; + full_text_links.contents().each(function() { + if (this.nodeType === 3) { + var trimmed = $.trim(this.nodeValue); + if (trimmed.startsWith('COVID-19')) { + hathi_etas = true; + return !hathi_pd; // if also pd, return early + } else if (trimmed.endsWith('HathiTrust')) { + hathi_pd = true; + return !hath_etas; // if also etas, return early + } + } + }); + var monograph = true; //TODO: determine whether this is actually a monograph? + return { + available: available, + hathi_etas: hathi_etas, + hathi_pd: hathi_pd, + monograph: monograph + }; + } + + // Based on hackily-parsed DOM context, determine whether the Pickup@Penn link should be suppressed + function disable_pickup_at_penn(ctx) { + return ctx.monograph && (!ctx.available || ctx.hathi_etas || ctx.hathi_pd); + } + function constructAeonLink(mmsid, holding) { + // TODO: remove this line once the libraries are open again + return null; + if(holding['link_to_aeon']) { return 'Request to view'; } @@ -102,6 +148,7 @@ $(document).ready(function() { "emptyTable": "No item data available" }, "drawCallback": function(settings) { + var request_context = get_request_context(mmsid); var table = $('#requestOptions-' + mmsid).DataTable(); var pageSize = table.settings()[0]['_iDisplayLength']; var tableLen = table.data().length; @@ -113,7 +160,8 @@ $(document).ready(function() { var requests = globaldata[data[i][7]]; if(validRequestTypes.indexOf(requests[0]) != -1) { renderdata[mmsid].push(data[i][7]); - data[i][5][0] = "Request"; + // TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request + data[i][5][0] = disable_pickup_at_penn(request_context) ? "" : "Pickup@Penn1"; table.row(i).invalidate().draw(); } } @@ -283,6 +331,7 @@ $(document).ready(function() { "emptyTable": "No item data available" }, "drawCallback": function(settings) { + var request_context = get_request_context(mmsid); var table = $('#holdingItems-' + mmsid).DataTable(); var pageSize = table.settings()[0]['_iDisplayLength']; var tableLen = table.data().length; @@ -294,7 +343,8 @@ $(document).ready(function() { var requests = globaldata[data[i][0]]; if(validRequestTypes.indexOf(requests[0]) != -1) { renderdata[mmsid].push(data[i][0]); - data[i][5].push("Request"); + // TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request + data[i][5].push(disable_pickup_at_penn(request_context) ? "" : "Pickup@Penn2"); table.row(i).invalidate().draw(); } } diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 1e36f7ea..c229664e 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -34,6 +34,10 @@ class FranklinAlmaController < ApplicationController @@bottomoptionslist['Suggest Fix / Enhance Record'] = 1 @@bottomoptionslist['Place on Course Reserve'] = 2 + def etas_monograph + false + end + def cmpOnlineServices(service_a, service_b) collection_a = service_a['collection'] || '' interface_a = service_a['interface_name'] || '' @@ -218,7 +222,8 @@ def single_availability else bib_data['availability'][mmsid]['holdings'].each do |holding| links = [] - links << "Request to view in reading room" if holding['link_to_aeon'] +# TODO: Uncomment when libraries reopen + #links << "Request to view in reading room" if holding['link_to_aeon'] holding['availability'] = availability_status[holding['availability']] || 'Requestable' if has_holding_info @@ -345,11 +350,11 @@ def holding_items end policies[policy] = "/alma/request/?mms_id=%{mms_id}&holding_id=%{holding_id}&item_pid=%{item_pid}" unless not_requestable } - table_data.each { |item| policy = item.shift() request_url = (policies[policy] || '') % params.merge({:item_pid => item[0]}) - item[5] << "Request" unless (request_url.empty? || item[2] != 'Item in place') + # TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request + item[5] << (etas_monograph ? "" : "Pickup@Penn3") unless (request_url.empty? || item[2] != 'Item in place') } render :json => {"data": table_data} @@ -373,13 +378,13 @@ def request_options case option['type']['value'] when 'HOLD' { - :option_name => 'Request', + :option_name => 'Pickup@Penn4', #:option_url => option['request_url'], :option_url => "/alma/request?mms_id=#{params['mms_id']}", :avail_for_physical => true, :avail_for_electronic => true, :highlightable => true - } + } unless etas_monograph # TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request when 'GES' option_url = option['request_url'] if option_url.index('?') diff --git a/app/helpers/document_render_helper.rb b/app/helpers/document_render_helper.rb index 82ef3687..beb80bbf 100644 --- a/app/helpers/document_render_helper.rb +++ b/app/helpers/document_render_helper.rb @@ -51,6 +51,7 @@ def render_electronic_holdings_links(electronic_holdings_str) end end + @@HATHI_PD_TEXT = 'HathiTrust Digital Library Connect to full text' @@HATHI_TMP_TEXT = 'HathiTrust Digital Library Login for full text' @@HATHI_REPLACEMENT_TEXT = 'COVID-19 Special Access from HathiTrust' @@HATHI_INFO = ' — Full text access only for students, active faculty, and permanent staff' @@ -58,31 +59,51 @@ def render_electronic_holdings_links(electronic_holdings_str) def render_online_resource_display_for_index_view(options) values = options[:value] - values.map do |value| + alma_mms_id = options[:document][:alma_mms_id] + hathi_pd = false + hathi_etas = false + ret = values.map do |value| JSON.parse(value).map do |link_struct| url = link_struct['linkurl'] text = link_struct['linktext'] append = '' - if text == @@HATHI_TMP_TEXT + if text == @@HATHI_PD_TEXT + hathi_pd = true + elsif text == @@HATHI_TMP_TEXT + hathi_etas = true text = @@HATHI_REPLACEMENT_TEXT url = @@HATHI_LOGIN_PREFIX + URI.encode_www_form_component(url) append = @@HATHI_INFO end %Q{#{text}#{append}} end.join('
    ') - end.join('
    ').html_safe + end.join('
    ') + unless alma_mms_id.nil? + if hathi_pd + ret = ret.concat(hathi_tag_id('pd', alma_mms_id)) + end + if hathi_etas + ret = ret.concat(hathi_tag_id('etas', alma_mms_id)) + end + end + ret.html_safe end def render_online_display_for_show_view(options) values = options[:value] - - values.map do |value| + alma_mms_id = options[:document][:alma_mms_id] + hathi_pd = false + hathi_etas = false + ret = values.map do |value| JSON.parse(value).map do |link_struct| url = link_struct['linkurl'] text = link_struct['linktext'] append = '' orig_url = url - if text == @@HATHI_TMP_TEXT + if text == @@HATHI_PD_TEXT + hathi_pd = true + elsif text == @@HATHI_TMP_TEXT + hathi_etas = true text = @@HATHI_REPLACEMENT_TEXT url = @@HATHI_LOGIN_PREFIX + URI.encode_www_form_component(url) append = @@HATHI_INFO @@ -119,7 +140,20 @@ def render_online_display_for_show_view(options) html end.join - end.join.html_safe + end.join + unless alma_mms_id.nil? + if hathi_pd + ret = ret.concat(hathi_tag_id('pd', alma_mms_id)) + end + if hathi_etas + ret = ret.concat(hathi_tag_id('etas', alma_mms_id)) + end + end + ret.html_safe + end + + def hathi_tag_id(type, id) + "
    " end def render_web_link_display(options) From 821a00eeb1289f83eba617d378c2eb5c3825c69e Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Tue, 30 Jun 2020 15:00:51 -0400 Subject: [PATCH 033/114] some more changes --- app/assets/javascripts/availability.js.erb | 50 ++++++--------------- app/controllers/franklin_alma_controller.rb | 15 +++++-- 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index 39b64341..86f54ea2 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -15,39 +15,11 @@ $(document).ready(function() { // Hackily parses relevant context out of the DOM for the specified mmsid function get_request_context(mmsid) { - var record_root = $('#doc_franklin_'+mmsid); - if (record_root.length == 0) { - record_root = $('#documents > div.document').has('div.documentHeader > h3.index_title a[href $= "_'+mmsid+'"]'); - } - var avail_jq_node = record_root.find('.availability-ajax-loaded[data-availability-ids='+mmsid+']') - var available = false; - avail_jq_node.contents().each(function() { - if (this.nodeType === 3 && $.trim(this.nodeValue).startsWith('Available')) { - available = true; - return false; // there's at least one "Available", so return early - } - }); - var full_text_links = record_root.find('dd.blacklight-full_text_links_for_cluster_display a'); - var hathi_pd = false; - var hathi_etas = false; - full_text_links.contents().each(function() { - if (this.nodeType === 3) { - var trimmed = $.trim(this.nodeValue); - if (trimmed.startsWith('COVID-19')) { - hathi_etas = true; - return !hathi_pd; // if also pd, return early - } else if (trimmed.endsWith('HathiTrust')) { - hathi_pd = true; - return !hath_etas; // if also etas, return early - } - } - }); - var monograph = true; //TODO: determine whether this is actually a monograph? return { - available: available, - hathi_etas: hathi_etas, - hathi_pd: hathi_pd, - monograph: monograph + available: (document.getElementById('available-'+mmsid) != null), + hathi_etas: (document.getElementById('hathi_etas-'+mmsid) != null), + hathi_pd: (document.getElementById('hathi_pd-'+mmsid) != null), + monograph: (document.getElementById('monograph-'+mmsid) != null) }; } @@ -121,6 +93,7 @@ $(document).ready(function() { }; Franklin.prototype.loadRequestOptionsAjax = function(mmsid) { + var request_context = get_request_context(mmsid); var url = "/alma/single_availability.json?mms_id=" + encodeURIComponent(mmsid); $('#requestOptions-' + mmsid).on('error.dt', function(e, settings, techNote, message) { @@ -130,9 +103,11 @@ $(document).ready(function() { .DataTable({ "ajax": function(data, callback, settings) { $.get(url, function(data) { + console.log("XXX1"); + console.log(data); globaldata = $.extend({}, globaldata, data["metadata"]); callback({"data": data["data"]}); - Franklin.prototype.loadRequestOptionListAjax(mmsid); + Franklin.prototype.loadRequestOptionListAjax(mmsid, request_context); }); }, "processing": true, @@ -148,7 +123,6 @@ $(document).ready(function() { "emptyTable": "No item data available" }, "drawCallback": function(settings) { - var request_context = get_request_context(mmsid); var table = $('#requestOptions-' + mmsid).DataTable(); var pageSize = table.settings()[0]['_iDisplayLength']; var tableLen = table.data().length; @@ -246,10 +220,14 @@ $(document).ready(function() { }); }; - Franklin.prototype.loadRequestOptionListAjax = function(mmsid) { + Franklin.prototype.loadRequestOptionListAjax = function(mmsid, request_context) { + console.log("XXX2") + console.log(request_context) $.ajax({ - url: "/alma/request_options.json?mms_id="+mmsid, + url: "/alma/request_options.json?mms_id="+mmsid+"&request_context="+encodeURIComponent(JSON.stringify(request_context)), success: function(data, textStatus, jqXHR) { + console.log("XXX3") + console.log(data) var optionList = $('#requestOptionList-' + mmsid); if(globaldata[mmsid]["facultyexpress"]) { diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index c229664e..3f413890 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -1,3 +1,4 @@ +require 'json' #class FranklinAlmaController < BlacklightAlma::AlmaController class FranklinAlmaController < ApplicationController @@ -300,7 +301,7 @@ def check_requestable(has_holding_info = false) end def holding_items - userid = session['id'].presence || nil + userid = 'mgibney'#session['id'].presence || nil due_date_policy = 'Please log in for loan and request information' if userid.nil? api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] @@ -360,9 +361,17 @@ def holding_items render :json => {"data": table_data} end + def suppress_pickup_at_penn(ctx) + return false unless ctx.monograph + return true unless ctx.available + return true if ctx.hathi_etas || ctx.hathi_pd + return false + end + def request_options - userid = session['id'].presence || nil + userid = 'mgibney'#session['id'].presence || nil usergroup = session['user_group'].presence + ctx = JSON.parse(params['request_context']) api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] options = {:user_id => userid, :consider_dlr => true} @@ -384,7 +393,7 @@ def request_options :avail_for_physical => true, :avail_for_electronic => true, :highlightable => true - } unless etas_monograph # TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request + } unless suppress_pickup_at_penn(ctx) # TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request when 'GES' option_url = option['request_url'] if option_url.index('?') From c0d6be86ffed3258ddc7595247ac7fa7e2ad3fa2 Mon Sep 17 00:00:00 2001 From: Nikitas Tampakis Date: Mon, 29 Jun 2020 23:30:02 -0400 Subject: [PATCH 034/114] limits the pickup options for the request form --- app/controllers/franklin_alma_controller.rb | 43 +++++++++++---------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 3f413890..36172f26 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -187,7 +187,7 @@ def single_availability # a 'holding_info' value. unless has_holding_info holding_data = api_instance.request(api.almaws_v1_bibs.mms_id_holdings_holding_id_items, :get, :mms_id => mmsid, :holding_id => 'ALL', :expand => 'due_date_policy', :user_id => userid) - + [holding_data['items']['item']].flatten.reject(&:nil?).each do |item| holding_id = item['holding_data']['holding_id'] item_pid = item['item_data']['pid'] @@ -328,7 +328,7 @@ def holding_items while options[:offset] + options[:limit] < response_data['total_record_count'] options[:offset] += options[:limit] response_data = api_instance.request(api.almaws_v1_bibs.mms_id_holdings_holding_id_items, :get, params.merge(options)) - + table_data += response_data['item'].map { |item| data = item['item_data'] unless(policies.has_key?(data['policy']['value']) || data['base_status']['desc'] != "Item in place" || userid.nil?) @@ -339,7 +339,7 @@ def holding_items } end - pids_to_check.each{ |pid, policy| + pids_to_check.each{ |pid, policy| options = {:user_id => userid, :item_pid => pid} response_data = api_instance.request(api.almaws_v1_bibs.mms_id_holdings_holding_id_items_item_pid_request_options, :get, params.merge(options)) not_requestable = true @@ -435,7 +435,7 @@ def request_options .uniq # Required due to request options API bug returning duplicate options .sort { |a,b| cmpRequestOptions(a,b) } # TODO: Remove when GES is updated in Alma & request option API is fixed (again) - results.reject! { |option| + results.reject! { |option| ['Send Penn Libraries a question','Books By Mail'].member?(option[:option_name]) || (option[:option_name] == 'FacultyEXPRESS' && usergroup != 'Faculty Express') } @@ -466,7 +466,7 @@ def request_title? response_data = api_instance.request(api.almaws_v1_bibs.mms_id_request_options, :get, params.merge(options)) - return (response_data['request_option'] || []).map { |option| + return (response_data['request_option'] || []).map { |option| option['type']['value'] }.member?('HOLD') end @@ -479,7 +479,7 @@ def request_item? response_data = api_instance.request(api.almaws_v1_bibs.mms_id_holdings_holding_id_items_item_pid_request_options, :get, params.merge(options)) - return (response_data['request_option'] || []).map { |option| + return (response_data['request_option'] || []).map { |option| option['type']['value'] }.member?('HOLD') end @@ -492,7 +492,7 @@ def load_request render 'catalog/bad_request' return end - + if params['item_pid'].present? render 'catalog/bad_request' unless request_item? else @@ -517,20 +517,21 @@ def load_request #.reject { |k,v| exclude_libs.member?(k) } #) - libraries = { "Annenberg Library" => "AnnenLib", + # Uncomment these as more libraries open up as delivery options + libraries = { #"Annenberg Library" => "AnnenLib", "Athenaeum Library" => "AthLib", - "Biomedical Library" => "BiomLib", - "Chemistry Library" => "ChemLib", - "Dental Medicine Library" => "DentalLib", - "Fisher Fine Arts Library" => "FisherFAL", - "Library at the Katz Center" => "KatzLib", - "Math/Physics/Astronomy Library" => "MPALib", - "Museum Library" => "MuseumLib", - "Ormandy Music and Media Center" => "MusicLib", - "Pennsylvania Hospital Library" => "PAHospLib", - "Van Pelt Library" => "VanPeltLib", - "Veterinary Library - New Bolton Center" => "VetNBLib", - "Veterinary Library - Penn Campus" => "VetPennLib" + #"Biomedical Library" => "BiomLib", + #"Chemistry Library" => "ChemLib", + #"Dental Medicine Library" => "DentalLib", + #"Fisher Fine Arts Library" => "FisherFAL", + #"Library at the Katz Center" => "KatzLib", + #"Math/Physics/Astronomy Library" => "MPALib", + #"Museum Library" => "MuseumLib", + #"Ormandy Music and Media Center" => "MusicLib", + #"Pennsylvania Hospital Library" => "PAHospLib", + "Van Pelt Library" => "VanPeltLib" + #"Veterinary Library - New Bolton Center" => "VetNBLib", + #"Veterinary Library - Penn Campus" => "VetPennLib" } if params['item_pid'].present? @@ -552,7 +553,7 @@ def create_request render 'catalog/bad_request' return end - + if params['item_pid'].present? render 'catalog/bad_request' unless request_item? else From a1590f3fa122c620f54c947beac7f155a318ec2d Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Tue, 30 Jun 2020 15:05:31 -0400 Subject: [PATCH 035/114] remove hardcoded userid (oops) --- app/controllers/franklin_alma_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 36172f26..9ae7ea8e 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -301,7 +301,7 @@ def check_requestable(has_holding_info = false) end def holding_items - userid = 'mgibney'#session['id'].presence || nil + userid = session['id'].presence || nil due_date_policy = 'Please log in for loan and request information' if userid.nil? api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] @@ -369,7 +369,7 @@ def suppress_pickup_at_penn(ctx) end def request_options - userid = 'mgibney'#session['id'].presence || nil + userid = session['id'].presence || nil usergroup = session['user_group'].presence ctx = JSON.parse(params['request_context']) api_instance = BlacklightAlma::BibsApi.instance From 08597d3a2be90657c3abcd03bb899d71fe6b477f Mon Sep 17 00:00:00 2001 From: Nikitas Tampakis Date: Tue, 30 Jun 2020 16:05:18 -0400 Subject: [PATCH 036/114] use availability to determine pickupable items Co-authored-by: Michael Gibney --- app/assets/javascripts/availability.js.erb | 15 +++++++-------- app/controllers/franklin_alma_controller.rb | 7 +++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index 86f54ea2..e006ac2f 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -4,7 +4,7 @@ var validRequestTypes = ["CentralCAT","MAINT-EC","CHI CAT","CatMet","HEB CAT", "Jap-KorCAT","MUSIC CAT","MidEastCat","SASIA CAT", "SCPC CAT","SLAV CAT","BindRepair","MAINT-enh", "MAINT-otf","MAINT-tr"]; -$.fn.dataTable.ext.errMode = 'none'; +$.fn.dataTable.ext.errMode = 'none'; $(document).ready(function() { @@ -16,10 +16,10 @@ $(document).ready(function() { // Hackily parses relevant context out of the DOM for the specified mmsid function get_request_context(mmsid) { return { - available: (document.getElementById('available-'+mmsid) != null), + pickupable: null, hathi_etas: (document.getElementById('hathi_etas-'+mmsid) != null), hathi_pd: (document.getElementById('hathi_pd-'+mmsid) != null), - monograph: (document.getElementById('monograph-'+mmsid) != null) + monograph: true //(document.getElementById('monograph-'+mmsid) != null) }; } @@ -138,7 +138,7 @@ $(document).ready(function() { data[i][5][0] = disable_pickup_at_penn(request_context) ? "" : "Pickup@Penn1"; table.row(i).invalidate().draw(); } - } + } } } @@ -221,8 +221,7 @@ $(document).ready(function() { }; Franklin.prototype.loadRequestOptionListAjax = function(mmsid, request_context) { - console.log("XXX2") - console.log(request_context) + request_context.pickupable = globaldata[mmsid]["pickupable"]; $.ajax({ url: "/alma/request_options.json?mms_id="+mmsid+"&request_context="+encodeURIComponent(JSON.stringify(request_context)), success: function(data, textStatus, jqXHR) { @@ -263,7 +262,7 @@ $(document).ready(function() { $('#request-options-spinner-' + mmsid).remove(); console.log(data); } - }); + }); }; Franklin.prototype.loadRequestOptions = function() { @@ -325,7 +324,7 @@ $(document).ready(function() { data[i][5].push(disable_pickup_at_penn(request_context) ? "" : "Pickup@Penn2"); table.row(i).invalidate().draw(); } - } + } } } diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 9ae7ea8e..86a15d49 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -172,6 +172,7 @@ def single_availability bib_data = bibapi.get_availability([mmsid]) holding_data = nil holding_map = {} + pickupable = false inventory_type = '' @@ -222,6 +223,7 @@ def single_availability .reject(&:nil?) else bib_data['availability'][mmsid]['holdings'].each do |holding| + pickupable = true if holding['availability'] == 'available' links = [] # TODO: Uncomment when libraries reopen #links << "Request to view in reading room" if holding['link_to_aeon'] @@ -271,7 +273,8 @@ def single_availability end metadata[mmsid][:inventory_type] = inventory_type - render :json => {"metadata": metadata, "data": table_data} + metadata[mmsid][:pickupable] = pickupable + render :json => { "metadata": metadata, "data": table_data } end def check_requestable(has_holding_info = false) @@ -363,7 +366,7 @@ def holding_items def suppress_pickup_at_penn(ctx) return false unless ctx.monograph - return true unless ctx.available + return true unless ctx.pickupable return true if ctx.hathi_etas || ctx.hathi_pd return false end From b63ec1de382b12c079f7a2e0f2416ca536db30e4 Mon Sep 17 00:00:00 2001 From: Nikitas Tampakis Date: Tue, 30 Jun 2020 16:29:27 -0400 Subject: [PATCH 037/114] Initial efforts to get the pickup button included with holdings table Co-authored-by: Michael Gibney --- app/assets/javascripts/availability.js.erb | 26 +++++++++++---------- app/controllers/franklin_alma_controller.rb | 8 ++++--- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index e006ac2f..6bbf9c14 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -6,6 +6,16 @@ var validRequestTypes = ["CentralCAT","MAINT-EC","CHI CAT","CatMet","HEB CAT", "MAINT-otf","MAINT-tr"]; $.fn.dataTable.ext.errMode = 'none'; +// Hackily parses relevant context out of the DOM for the specified mmsid +function get_request_context(mmsid) { + return { + pickupable: null, + hathi_etas: (document.getElementById('hathi_etas-'+mmsid) != null), + hathi_pd: (document.getElementById('hathi_pd-'+mmsid) != null), + monograph: false //(document.getElementById('monograph-'+mmsid) != null) + }; +} + $(document).ready(function() { // subclass BlacklightAlma @@ -13,16 +23,6 @@ $(document).ready(function() { BlacklightAlma.call(this); } - // Hackily parses relevant context out of the DOM for the specified mmsid - function get_request_context(mmsid) { - return { - pickupable: null, - hathi_etas: (document.getElementById('hathi_etas-'+mmsid) != null), - hathi_pd: (document.getElementById('hathi_pd-'+mmsid) != null), - monograph: true //(document.getElementById('monograph-'+mmsid) != null) - }; - } - // Based on hackily-parsed DOM context, determine whether the Pickup@Penn link should be suppressed function disable_pickup_at_penn(ctx) { return ctx.monograph && (!ctx.available || ctx.hathi_etas || ctx.hathi_pd); @@ -368,11 +368,13 @@ $(document).ready(function() { ba.loadRequestOptions(); }); -function loadItems(mms_id, holding_id, location_code) { +function loadItems(mms_id, holding_id, location_code, pickupable) { + var request_context = get_request_context(mms_id); + request_context.pickupable = pickupable; renderdata[mms_id] = []; var holdingItemsTable = $('#holdingItems-' + mms_id).DataTable(); holdingItemsTable.clear().draw(); - holdingItemsTable.ajax.url('/alma/holding_items.json?mms_id=' + mms_id + "&holding_id=" + holding_id + "¤t_location=" + location_code).load(); + holdingItemsTable.ajax.url('/alma/holding_items.json?mms_id=' + mms_id + "&holding_id=" + holding_id + "¤t_location=" + location_code + "&request_context=" + encodeURIComponent(JSON.stringify(request_context))).load(); swapDataTables(mms_id); } diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 86a15d49..9e2835ee 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -223,7 +223,8 @@ def single_availability .reject(&:nil?) else bib_data['availability'][mmsid]['holdings'].each do |holding| - pickupable = true if holding['availability'] == 'available' + holding_pickupable = holding['availability'] == 'available' + pickupable = true if holding_pickupable links = [] # TODO: Uncomment when libraries reopen #links << "Request to view in reading room" if holding['link_to_aeon'] @@ -231,7 +232,7 @@ def single_availability if has_holding_info inventory_type = 'physical' - holding['location'] = %Q[#{holding['location']} >
    #{holding['call_number']}] + holding['location'] = %Q[#{holding['location']} >
    #{holding['call_number']}] holding['availability'] = "" elsif has_portfolio_info inventory_type = 'electronic' @@ -354,11 +355,12 @@ def holding_items end policies[policy] = "/alma/request/?mms_id=%{mms_id}&holding_id=%{holding_id}&item_pid=%{item_pid}" unless not_requestable } + suppress = suppress_pickup_at_penn(JSON.parse(params['request_context'])) table_data.each { |item| policy = item.shift() request_url = (policies[policy] || '') % params.merge({:item_pid => item[0]}) # TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request - item[5] << (etas_monograph ? "" : "Pickup@Penn3") unless (request_url.empty? || item[2] != 'Item in place') + item[5] << (suppress ? "" : "Pickup@Penn3") unless (request_url.empty? || item[2] != 'Item in place') } render :json => {"data": table_data} From 534974ec9a074651c2498dc95e546432a916584c Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Wed, 1 Jul 2020 12:28:59 -0400 Subject: [PATCH 038/114] make it easy to force user for local development -- temporary? --- app/controllers/franklin_alma_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 9e2835ee..55c9d62a 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -167,7 +167,7 @@ def single_availability api = api_instance.ezwadl_api[0] mmsid = params[:mms_id] - userid = session['id'].presence || 'GUEST' + userid = ENV['FORCE_USER_ID'] || session['id'].presence || 'GUEST' bibapi = alma_api_class.new() bib_data = bibapi.get_availability([mmsid]) holding_data = nil @@ -294,7 +294,7 @@ def check_requestable(has_holding_info = false) end end - userid = session['id'].presence + userid = ENV['FORCE_USER_ID'].presence || session['id'].presence usergroup = session['user_group'].presence mmsid = params[:mms_id] @@ -305,7 +305,7 @@ def check_requestable(has_holding_info = false) end def holding_items - userid = session['id'].presence || nil + userid = ENV['FORCE_USER_ID'].presence || session['id'].presence || nil due_date_policy = 'Please log in for loan and request information' if userid.nil? api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] @@ -374,7 +374,7 @@ def suppress_pickup_at_penn(ctx) end def request_options - userid = session['id'].presence || nil + userid = ENV['FORCE_USER_ID'].presence || session['id'].presence || nil usergroup = session['user_group'].presence ctx = JSON.parse(params['request_context']) api_instance = BlacklightAlma::BibsApi.instance @@ -466,7 +466,7 @@ def request_options def request_title? api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] - userid = session['id'].presence || 'GUEST' + userid = ENV['FORCE_USER_ID'].presence || session['id'].presence || 'GUEST' options = {:user_id => userid, :format => 'json', :consider_dlr => true} response_data = api_instance.request(api.almaws_v1_bibs.mms_id_request_options, :get, params.merge(options)) @@ -479,7 +479,7 @@ def request_title? def request_item? api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] - userid = session['id'].presence || 'GUEST' + userid = ENV['FORCE_USER_ID'].presence || session['id'].presence || 'GUEST' options = {:user_id => userid, :format => 'json'} response_data = api_instance.request(api.almaws_v1_bibs.mms_id_holdings_holding_id_items_item_pid_request_options, :get, params.merge(options)) From 3ff1e8140668359baf0759df0c03e3a956193b69 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Wed, 1 Jul 2020 12:42:57 -0400 Subject: [PATCH 039/114] properly detect/register "monograph" boolean in DOM --- Gemfile | 1 + Gemfile.lock | 2 ++ app/assets/javascripts/availability.js.erb | 2 +- app/helpers/document_render_helper.rb | 6 ++++++ app/views/catalog/_index_default.html.erb | 1 + app/views/catalog/_show_default.html.erb | 1 + 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 84a76875..55ddbfa3 100644 --- a/Gemfile +++ b/Gemfile @@ -71,6 +71,7 @@ end group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platforms: :ruby + gem 'rb-readline' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index af70dab8..54b22902 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -287,6 +287,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) + rb-readline (0.5.5) rdoc (4.3.0) ref (2.0.0) responders (2.4.1) @@ -402,6 +403,7 @@ DEPENDENCIES passenger (= 5.1.6) pry-rails rails (~> 4.2.0) + rb-readline rsolr (= 1.1.2) sass-rails (= 5.0.6) sdoc (= 0.4.2) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index 6bbf9c14..a0c3a9a9 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -12,7 +12,7 @@ function get_request_context(mmsid) { pickupable: null, hathi_etas: (document.getElementById('hathi_etas-'+mmsid) != null), hathi_pd: (document.getElementById('hathi_pd-'+mmsid) != null), - monograph: false //(document.getElementById('monograph-'+mmsid) != null) + monograph: (document.getElementById('monograph-'+mmsid) != null) }; } diff --git a/app/helpers/document_render_helper.rb b/app/helpers/document_render_helper.rb index beb80bbf..ba95f779 100644 --- a/app/helpers/document_render_helper.rb +++ b/app/helpers/document_render_helper.rb @@ -57,6 +57,12 @@ def render_electronic_holdings_links(electronic_holdings_str) @@HATHI_INFO = ' — Full text access only for students, active faculty, and permanent staff' @@HATHI_LOGIN_PREFIX = 'https://babel.hathitrust.org/Shibboleth.sso/Login?entityID=https://idp.pennkey.upenn.edu/idp/shibboleth&target=https%3A%2F%2Fbabel.hathitrust.org%2Fcgi%2Fping%2Fpong%3Ftarget%3D' + def detect_monograph(document) + return nil unless (alma_mms_id = document[:alma_mms_id]).presence + return nil unless ['a','m'].include?(document.to_marc.leader[7]) + "
    ".html_safe + end + def render_online_resource_display_for_index_view(options) values = options[:value] alma_mms_id = options[:document][:alma_mms_id] diff --git a/app/views/catalog/_index_default.html.erb b/app/views/catalog/_index_default.html.erb index c551492f..e80400b4 100644 --- a/app/views/catalog/_index_default.html.erb +++ b/app/views/catalog/_index_default.html.erb @@ -1,4 +1,5 @@ <% doc_presenter = index_presenter(document) %> +<%= detect_monograph(document) %> <%# default partial to display solr document fields in catalog index view -%>
    diff --git a/app/views/catalog/_show_default.html.erb b/app/views/catalog/_show_default.html.erb index 017150ee..80dc6eee 100644 --- a/app/views/catalog/_show_default.html.erb +++ b/app/views/catalog/_show_default.html.erb @@ -1,5 +1,6 @@ <% doc_presenter = show_presenter(document) %> +<%= detect_monograph(document) %> <%# default partial to display solr document fields in catalog show view -%>
    <%= render partial: 'show_expanded', locals: { document: document } %> From a7b226ca445c879e5fd6d2d571fe709ad1f46170 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Wed, 1 Jul 2020 16:29:29 -0400 Subject: [PATCH 040/114] also add FORCE_USER_GROUP for development --- app/controllers/franklin_alma_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 55c9d62a..56575963 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -295,7 +295,7 @@ def check_requestable(has_holding_info = false) end userid = ENV['FORCE_USER_ID'].presence || session['id'].presence - usergroup = session['user_group'].presence + usergroup = ENV['FORCE_USER_GROUP'].presence || session['user_group'].presence mmsid = params[:mms_id] result[mmsid] = {:facultyexpress => usergroup == 'Faculty Express', :group => usergroup} @@ -375,7 +375,7 @@ def suppress_pickup_at_penn(ctx) def request_options userid = ENV['FORCE_USER_ID'].presence || session['id'].presence || nil - usergroup = session['user_group'].presence + usergroup = ENV['FORCE_USER_GROUP'].presence || session['user_group'].presence ctx = JSON.parse(params['request_context']) api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] @@ -458,7 +458,7 @@ def request_options :option_url => "https://franklin.library.upenn.edu/redir/booksbymail?bibid=#{params['mms_id']}", :avail_for_physical => true, :avail_for_electronic => false - }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(session['user_group']) + }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(ENV['FORCE_USER_GROUP'].presence || session['user_group']) render :json => results end From b4c2a25413eb709056f71ec8c793a1472caf8934 Mon Sep 17 00:00:00 2001 From: Nikitas Tampakis Date: Wed, 1 Jul 2020 16:30:01 -0400 Subject: [PATCH 041/114] fix for monograph context access for pickup --- app/controllers/franklin_alma_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 56575963..9fa5132e 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -367,9 +367,9 @@ def holding_items end def suppress_pickup_at_penn(ctx) - return false unless ctx.monograph - return true unless ctx.pickupable - return true if ctx.hathi_etas || ctx.hathi_pd + return false unless ctx['monograph'] + return true unless ctx['pickupable'] + return true if ctx['hathi_etas'] || ctx['hathi_pd'] return false end From 4645e293c7fb038f5dab36b1014ba6e9da0014dc Mon Sep 17 00:00:00 2001 From: Nikitas Tampakis Date: Thu, 2 Jul 2020 11:28:44 -0400 Subject: [PATCH 042/114] remove athenaeum pickup option, change button to report cataloging error --- app/controllers/franklin_alma_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 9fa5132e..5b1fa1a1 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -449,7 +449,7 @@ def request_options results.each { |option| case option[:option_name] when 'Suggest Fix / Enhance Record' - option[:option_name] = "Report Error" + option[:option_name] = "Report Cataloging Error" end } @@ -524,7 +524,7 @@ def load_request # Uncomment these as more libraries open up as delivery options libraries = { #"Annenberg Library" => "AnnenLib", - "Athenaeum Library" => "AthLib", + #"Athenaeum Library" => "AthLib", #"Biomedical Library" => "BiomLib", #"Chemistry Library" => "ChemLib", #"Dental Medicine Library" => "DentalLib", From 5d5013ef7483553090b5e8b97fcdd8fa5dd51afd Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Thu, 2 Jul 2020 16:05:38 -0400 Subject: [PATCH 043/114] reintroduce facex, etc. --- app/assets/javascripts/availability.js.erb | 18 +++++++++++++---- app/controllers/franklin_alma_controller.rb | 22 +++++++++++++-------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index a0c3a9a9..6dadda95 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -25,7 +25,7 @@ $(document).ready(function() { // Based on hackily-parsed DOM context, determine whether the Pickup@Penn link should be suppressed function disable_pickup_at_penn(ctx) { - return ctx.monograph && (!ctx.available || ctx.hathi_etas || ctx.hathi_pd); + return ctx.monograph && (ctx.pickupable === false || ctx.hathi_etas /*|| ctx.hathi_pd*/); } function constructAeonLink(mmsid, holding) { @@ -42,14 +42,15 @@ $(document).ready(function() { Franklin.prototype = Object.create(BlacklightAlma.prototype); Franklin.prototype.formatHolding = function (mms_id, holding) { + var ctx = get_request_context(mms_id); if (holding['inventory_type'] == 'physical') { var availability = "Unknown"; if (holding['availability'] == 'check_holdings') { availability = "See options"; } else if (holding['availability'] == 'unavailable') { - availability = "See request options"; + availability = "Unavailable";//"See request options"; } else if (holding['availability'] == 'available') { - availability = "Available"; + availability = disable_pickup_at_penn(ctx) ? "Restricted (COVID-19)" : "Available"; } // TODO: pass in format to shelfLocatorLink() somehow return [availability, holding['location'], holding['call_number'], $.shelfLocatorLink(mms_id, holding, "TODO"), constructAeonLink(mms_id, holding)] @@ -94,7 +95,7 @@ $(document).ready(function() { Franklin.prototype.loadRequestOptionsAjax = function(mmsid) { var request_context = get_request_context(mmsid); - var url = "/alma/single_availability.json?mms_id=" + encodeURIComponent(mmsid); + var url = "/alma/single_availability.json?mms_id=" + encodeURIComponent(mmsid) + "&request_context=" + encodeURIComponent(JSON.stringify(request_context)); $('#requestOptions-' + mmsid).on('error.dt', function(e, settings, techNote, message) { $(this).dataTable().fnSettings().oLanguage.sEmptyTable = 'An error has occurred.'; @@ -230,12 +231,21 @@ $(document).ready(function() { var optionList = $('#requestOptionList-' + mmsid); if(globaldata[mmsid]["facultyexpress"]) { + registeredFacEx = false; for(i = 0; i < data.length; i++) { if(data[i]['option_name'] == 'Interlibrary Loan') { data[i]['option_name'] = 'FacultyEXPRESS'; + registeredFacEx = true; break; } } + if (!registeredFacEx) { + data.push({ + option_name: 'FacultyEXPRESS', + option_url: 'https://franklin.library.upenn.edu/forms/ill?requesttype=book', //TODO: openurl params to pre-populate form? + highlightable: true + }); + } } // Remove once request option API is fixed diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 5b1fa1a1..1583a050 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -35,10 +35,6 @@ class FranklinAlmaController < ApplicationController @@bottomoptionslist['Suggest Fix / Enhance Record'] = 1 @@bottomoptionslist['Place on Course Reserve'] = 2 - def etas_monograph - false - end - def cmpOnlineServices(service_a, service_b) collection_a = service_a['collection'] || '' interface_a = service_a['interface_name'] || '' @@ -222,6 +218,7 @@ def single_availability end .reject(&:nil?) else + ctx = JSON.parse(params[:request_context]) bib_data['availability'][mmsid]['holdings'].each do |holding| holding_pickupable = holding['availability'] == 'available' pickupable = true if holding_pickupable @@ -250,8 +247,16 @@ def single_availability if userid == 'GUEST' holding['availability'] = 'Log in & request below' else - holding['availability'] = 'Not on shelf; request below' + if suppress_pickup_at_penn(ctx) || (ENV['FORCE_USER_GROUP'].presence || session['user_group']) == 'Faculty Express' + # we're temporarily disabling all request options for non facex + holding['availability'] = 'Not on shelf' + else + # for non-request-suppressed items and FacEx users, still present the usual link + holding['availability'] = 'Not on shelf; request below' + end end + elsif holding['availability'] == 'Available' && suppress_pickup_at_penn(ctx) + holding['availability'] = 'Restricted (COVID-19)' end end @@ -368,8 +373,8 @@ def holding_items def suppress_pickup_at_penn(ctx) return false unless ctx['monograph'] - return true unless ctx['pickupable'] - return true if ctx['hathi_etas'] || ctx['hathi_pd'] + return true unless ctx['pickupable'] != false + return true if ctx['hathi_etas'] #|| ctx['hathi_pd'] return false end @@ -457,7 +462,8 @@ def request_options :option_name => "Books By Mail", :option_url => "https://franklin.library.upenn.edu/redir/booksbymail?bibid=#{params['mms_id']}", :avail_for_physical => true, - :avail_for_electronic => false + :avail_for_electronic => false, + :highlightable => true }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(ENV['FORCE_USER_GROUP'].presence || session['user_group']) render :json => results From 78653b3075145c21313d9f7a628d5984afa2001d Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Sun, 5 Jul 2020 22:42:20 -0400 Subject: [PATCH 044/114] suppress bbm using same logic as for pickup@penn --- app/controllers/franklin_alma_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 1583a050..c71ad7db 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -464,7 +464,7 @@ def request_options :avail_for_physical => true, :avail_for_electronic => false, :highlightable => true - }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(ENV['FORCE_USER_GROUP'].presence || session['user_group']) + }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(ENV['FORCE_USER_GROUP'].presence || session['user_group']) && !suppress_pickup_at_penn(ctx) # suppress for bbm is same as for Pickup@Penn render :json => results end From dc037f8216de7d7487d3de830b3ea24e81d27f1a Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Sun, 5 Jul 2020 22:44:48 -0400 Subject: [PATCH 045/114] remove "indexed" pickup@penn (was for debugging only) --- app/assets/javascripts/availability.js.erb | 4 ++-- app/controllers/franklin_alma_controller.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index 6dadda95..2689b93c 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -136,7 +136,7 @@ $(document).ready(function() { if(validRequestTypes.indexOf(requests[0]) != -1) { renderdata[mmsid].push(data[i][7]); // TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request - data[i][5][0] = disable_pickup_at_penn(request_context) ? "" : "Pickup@Penn1"; + data[i][5][0] = disable_pickup_at_penn(request_context) ? "" : "Pickup@Penn"; table.row(i).invalidate().draw(); } } @@ -331,7 +331,7 @@ $(document).ready(function() { if(validRequestTypes.indexOf(requests[0]) != -1) { renderdata[mmsid].push(data[i][0]); // TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request - data[i][5].push(disable_pickup_at_penn(request_context) ? "" : "Pickup@Penn2"); + data[i][5].push(disable_pickup_at_penn(request_context) ? "" : "Pickup@Penn"); table.row(i).invalidate().draw(); } } diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index c71ad7db..95ea8418 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -365,7 +365,7 @@ def holding_items policy = item.shift() request_url = (policies[policy] || '') % params.merge({:item_pid => item[0]}) # TODO: when libraries reopen: remove conditional, Pickup@Penn=>Request - item[5] << (suppress ? "" : "Pickup@Penn3") unless (request_url.empty? || item[2] != 'Item in place') + item[5] << (suppress ? "" : "Pickup@Penn") unless (request_url.empty? || item[2] != 'Item in place') } render :json => {"data": table_data} @@ -397,7 +397,7 @@ def request_options case option['type']['value'] when 'HOLD' { - :option_name => 'Pickup@Penn4', + :option_name => 'Pickup@Penn', #:option_url => option['request_url'], :option_url => "/alma/request?mms_id=#{params['mms_id']}", :avail_for_physical => true, From ded0080ec44b4696ab640071fedaa514ad1cb9f7 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Sun, 5 Jul 2020 23:07:01 -0400 Subject: [PATCH 046/114] remove some js debug logging --- app/assets/javascripts/availability.js.erb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index 2689b93c..b846bab0 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -104,8 +104,6 @@ $(document).ready(function() { .DataTable({ "ajax": function(data, callback, settings) { $.get(url, function(data) { - console.log("XXX1"); - console.log(data); globaldata = $.extend({}, globaldata, data["metadata"]); callback({"data": data["data"]}); Franklin.prototype.loadRequestOptionListAjax(mmsid, request_context); @@ -226,8 +224,6 @@ $(document).ready(function() { $.ajax({ url: "/alma/request_options.json?mms_id="+mmsid+"&request_context="+encodeURIComponent(JSON.stringify(request_context)), success: function(data, textStatus, jqXHR) { - console.log("XXX3") - console.log(data) var optionList = $('#requestOptionList-' + mmsid); if(globaldata[mmsid]["facultyexpress"]) { @@ -270,7 +266,6 @@ $(document).ready(function() { containingdiv.appendTo(optionList); }); $('#request-options-spinner-' + mmsid).remove(); - console.log(data); } }); }; From 4bd65ae0f015e1fefda63c76f71a16244e76d363 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Sun, 5 Jul 2020 23:07:50 -0400 Subject: [PATCH 047/114] for reintroduced FacEx, grab OpenURL params out of template url from other service option --- app/assets/javascripts/availability.js.erb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index b846bab0..b2123deb 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -228,17 +228,27 @@ $(document).ready(function() { if(globaldata[mmsid]["facultyexpress"]) { registeredFacEx = false; + openUrlTemplate = null; for(i = 0; i < data.length; i++) { if(data[i]['option_name'] == 'Interlibrary Loan') { data[i]['option_name'] = 'FacultyEXPRESS'; registeredFacEx = true; break; + } else if (!registeredFacEx && data[i]['option_name'] == 'Request Digital Delivery') { + // always expect to have 'Request Digital Delivery' -- we'll grab the openUrl params from here if necessary + openUrlTemplate = data[i]['option_url']; } } if (!registeredFacEx) { + prefix = 'https://franklin.library.upenn.edu/redir/ill?requesttype=ScanDelivery'; + if (openUrlTemplate != null && openUrlTemplate.startsWith(prefix)) { + appendOpenUrlParams = openUrlTemplate.slice(prefix.length); + } else { + appendOpenUrlParams = ''; + } data.push({ option_name: 'FacultyEXPRESS', - option_url: 'https://franklin.library.upenn.edu/forms/ill?requesttype=book', //TODO: openurl params to pre-populate form? + option_url: 'https://franklin.library.upenn.edu/forms/ill?requesttype=book' + appendOpenUrlParams, highlightable: true }); } From a779bb338f39e7675a3ef6c53f6a445bb9448a6f Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 6 Jul 2020 07:52:36 -0400 Subject: [PATCH 048/114] do not introduce FacEx for etas monographs; per griscom via egmowens --- app/assets/javascripts/availability.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index b2123deb..ebdd9cde 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -239,7 +239,7 @@ $(document).ready(function() { openUrlTemplate = data[i]['option_url']; } } - if (!registeredFacEx) { + if (!registeredFacEx && (!request_context.monograph || !request_context.hathi_etas)) { prefix = 'https://franklin.library.upenn.edu/redir/ill?requesttype=ScanDelivery'; if (openUrlTemplate != null && openUrlTemplate.startsWith(prefix)) { appendOpenUrlParams = openUrlTemplate.slice(prefix.length); From b256f491a10958a4ea7ca564b01ff48528f5cab8 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 6 Jul 2020 08:25:25 -0400 Subject: [PATCH 049/114] remove FORCE_USER_ID, FORCE_USER_GROUP stuff --- app/controllers/franklin_alma_controller.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 95ea8418..1d2ae1c6 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -163,7 +163,7 @@ def single_availability api = api_instance.ezwadl_api[0] mmsid = params[:mms_id] - userid = ENV['FORCE_USER_ID'] || session['id'].presence || 'GUEST' + userid = session['id'].presence || 'GUEST' bibapi = alma_api_class.new() bib_data = bibapi.get_availability([mmsid]) holding_data = nil @@ -247,7 +247,7 @@ def single_availability if userid == 'GUEST' holding['availability'] = 'Log in & request below' else - if suppress_pickup_at_penn(ctx) || (ENV['FORCE_USER_GROUP'].presence || session['user_group']) == 'Faculty Express' + if suppress_pickup_at_penn(ctx) || session['user_group'] == 'Faculty Express' # we're temporarily disabling all request options for non facex holding['availability'] = 'Not on shelf' else @@ -299,8 +299,8 @@ def check_requestable(has_holding_info = false) end end - userid = ENV['FORCE_USER_ID'].presence || session['id'].presence - usergroup = ENV['FORCE_USER_GROUP'].presence || session['user_group'].presence + userid = session['id'].presence + usergroup = session['user_group'].presence mmsid = params[:mms_id] result[mmsid] = {:facultyexpress => usergroup == 'Faculty Express', :group => usergroup} @@ -310,7 +310,7 @@ def check_requestable(has_holding_info = false) end def holding_items - userid = ENV['FORCE_USER_ID'].presence || session['id'].presence || nil + userid = session['id'].presence || nil due_date_policy = 'Please log in for loan and request information' if userid.nil? api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] @@ -379,8 +379,8 @@ def suppress_pickup_at_penn(ctx) end def request_options - userid = ENV['FORCE_USER_ID'].presence || session['id'].presence || nil - usergroup = ENV['FORCE_USER_GROUP'].presence || session['user_group'].presence + userid = session['id'].presence || nil + usergroup = session['user_group'].presence ctx = JSON.parse(params['request_context']) api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] @@ -464,7 +464,7 @@ def request_options :avail_for_physical => true, :avail_for_electronic => false, :highlightable => true - }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(ENV['FORCE_USER_GROUP'].presence || session['user_group']) && !suppress_pickup_at_penn(ctx) # suppress for bbm is same as for Pickup@Penn + }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(session['user_group']) && !suppress_pickup_at_penn(ctx) # suppress for bbm is same as for Pickup@Penn render :json => results end @@ -472,7 +472,7 @@ def request_options def request_title? api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] - userid = ENV['FORCE_USER_ID'].presence || session['id'].presence || 'GUEST' + userid = session['id'].presence || 'GUEST' options = {:user_id => userid, :format => 'json', :consider_dlr => true} response_data = api_instance.request(api.almaws_v1_bibs.mms_id_request_options, :get, params.merge(options)) @@ -485,7 +485,7 @@ def request_title? def request_item? api_instance = BlacklightAlma::BibsApi.instance api = api_instance.ezwadl_api[0] - userid = ENV['FORCE_USER_ID'].presence || session['id'].presence || 'GUEST' + userid = session['id'].presence || 'GUEST' options = {:user_id => userid, :format => 'json'} response_data = api_instance.request(api.almaws_v1_bibs.mms_id_holdings_holding_id_items_item_pid_request_options, :get, params.merge(options)) From bfd7eb068e1c7ae38c6370f44f0718b15e80ad13 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 6 Jul 2020 09:00:06 -0400 Subject: [PATCH 050/114] remove readline dependency --- Gemfile | 1 - Gemfile.lock | 2 -- 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index 55ddbfa3..84a76875 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,6 @@ end group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platforms: :ruby - gem 'rb-readline' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 54b22902..af70dab8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -287,7 +287,6 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rb-readline (0.5.5) rdoc (4.3.0) ref (2.0.0) responders (2.4.1) @@ -403,7 +402,6 @@ DEPENDENCIES passenger (= 5.1.6) pry-rails rails (~> 4.2.0) - rb-readline rsolr (= 1.1.2) sass-rails (= 5.0.6) sdoc (= 0.4.2) From 04dbe1ae24a3ecc88116cd06d76bcc4bef3eb3b4 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 6 Jul 2020 09:47:06 -0400 Subject: [PATCH 051/114] hotfix for NPE in bento catalog controller --- app/search_engines/bento_search/catalog_engine.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/search_engines/bento_search/catalog_engine.rb b/app/search_engines/bento_search/catalog_engine.rb index c7315b5e..31083300 100644 --- a/app/search_engines/bento_search/catalog_engine.rb +++ b/app/search_engines/bento_search/catalog_engine.rb @@ -74,8 +74,13 @@ def search_implementation(args) summary = Hash.from_xml(Nokogiri::XML(entry['summary']).to_xml) - list_terms = summary['dl']['dt'].respond_to?(:each) ? summary['dl']['dt'] : [summary['dl']['dt']] - list_definitions = summary['dl']['dd'].respond_to?(:each) ? summary['dl']['dd'] : [summary['dl']['dd']] + if summary.nil? || !summary['dl'] + list_terms = [] + list_definitions = []; + else + list_terms = summary['dl']['dt'].respond_to?(:each) ? summary['dl']['dt'] : [summary['dl']['dt']] + list_definitions = summary['dl']['dd'].respond_to?(:each) ? summary['dl']['dd'] : [summary['dl']['dd']] + end list_terms.each_with_index do |term, index| case term.downcase[0..term.length-2] From ad9cb419a7790a079d0592c1988d3bb692053af7 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 6 Jul 2020 09:47:06 -0400 Subject: [PATCH 052/114] hotfix for NPE in bento catalog controller (cherry picked from commit 04dbe1ae24a3ecc88116cd06d76bcc4bef3eb3b4) --- app/search_engines/bento_search/catalog_engine.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/search_engines/bento_search/catalog_engine.rb b/app/search_engines/bento_search/catalog_engine.rb index c7315b5e..31083300 100644 --- a/app/search_engines/bento_search/catalog_engine.rb +++ b/app/search_engines/bento_search/catalog_engine.rb @@ -74,8 +74,13 @@ def search_implementation(args) summary = Hash.from_xml(Nokogiri::XML(entry['summary']).to_xml) - list_terms = summary['dl']['dt'].respond_to?(:each) ? summary['dl']['dt'] : [summary['dl']['dt']] - list_definitions = summary['dl']['dd'].respond_to?(:each) ? summary['dl']['dd'] : [summary['dl']['dd']] + if summary.nil? || !summary['dl'] + list_terms = [] + list_definitions = []; + else + list_terms = summary['dl']['dt'].respond_to?(:each) ? summary['dl']['dt'] : [summary['dl']['dt']] + list_definitions = summary['dl']['dd'].respond_to?(:each) ? summary['dl']['dd'] : [summary['dl']['dd']] + end list_terms.each_with_index do |term, index| case term.downcase[0..term.length-2] From 133aaab8cd8a3020de9fd1d31863324785ac608d Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 6 Jul 2020 12:10:40 -0400 Subject: [PATCH 053/114] add undergrads to approved for BooksByMail, per sketchum see: https://ithelp.library.upenn.edu/helpdesk/tickets/4619 --- app/controllers/franklin_alma_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 1d2ae1c6..cbda4ed0 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -464,7 +464,7 @@ def request_options :avail_for_physical => true, :avail_for_electronic => false, :highlightable => true - }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Library Staff'].member?(session['user_group']) && !suppress_pickup_at_penn(ctx) # suppress for bbm is same as for Pickup@Penn + }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Undergraduate Student','Library Staff'].member?(session['user_group']) && !suppress_pickup_at_penn(ctx) # suppress for bbm is same as for Pickup@Penn render :json => results end From 4354cdb06175a18467fa8781cc70cd569c6e6efe Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 6 Jul 2020 13:13:44 -0400 Subject: [PATCH 054/114] add Staff, Associate, Retired Library Staff to BBM-eligible, per batista --- app/controllers/franklin_alma_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index cbda4ed0..707d0f5f 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -464,7 +464,7 @@ def request_options :avail_for_physical => true, :avail_for_electronic => false, :highlightable => true - }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Undergraduate Student','Library Staff'].member?(session['user_group']) && !suppress_pickup_at_penn(ctx) # suppress for bbm is same as for Pickup@Penn + }) if ['Athenaeum Member','Faculty','Faculty Express','Grad Student','Undergraduate Student','Staff','Associate','Retired Library Staff','Library Staff'].member?(session['user_group']) && !suppress_pickup_at_penn(ctx) # suppress for bbm is same as for Pickup@Penn render :json => results end From 591687a9d67f64b9407dba5135c49f28c6f40876 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 13 Jul 2020 13:44:15 -0400 Subject: [PATCH 055/114] always grab openUrl params to direct BBM link to ILL w/ special "deliverytype" param --- app/assets/javascripts/availability.js.erb | 52 ++++++++++++++-------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index ebdd9cde..53a875ab 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -226,32 +226,48 @@ $(document).ready(function() { success: function(data, textStatus, jqXHR) { var optionList = $('#requestOptionList-' + mmsid); - if(globaldata[mmsid]["facultyexpress"]) { - registeredFacEx = false; - openUrlTemplate = null; - for(i = 0; i < data.length; i++) { - if(data[i]['option_name'] == 'Interlibrary Loan') { - data[i]['option_name'] = 'FacultyEXPRESS'; - registeredFacEx = true; + var openUrlTemplate = null; // grab openUrl params from here if necessary + var registeredFacEx = globaldata[mmsid]['facultyexpress'] ? false : null; // null if not applicable + var booksByMailOption = null; + for(var i = 0; i < data.length && (openUrlTemplate === null || booksByMailOption === null || registeredFacEx === false); i++) { + var requestOption = data[i]; + switch (requestOption['option_name']) { + case 'Interlibrary Loan': + openUrlTemplate = requestOption['option_url']; + if (registeredFacEx === false) { // careful! must distinguish from "falsey" null + requestOption['option_name'] = 'FacultyEXPRESS'; + registeredFacEx = true; + } + break; + case 'Request Digital Delivery': + if (openUrlTemplate === null) { + // provisionally grab openUrl from here, but prefer from ILL if present for consistency + openUrlTemplate = requestOption['option_url']; + } + break; + case 'Books By Mail': + booksByMailOption = requestOption; break; - } else if (!registeredFacEx && data[i]['option_name'] == 'Request Digital Delivery') { - // always expect to have 'Request Digital Delivery' -- we'll grab the openUrl params from here if necessary - openUrlTemplate = data[i]['option_url']; - } } - if (!registeredFacEx && (!request_context.monograph || !request_context.hathi_etas)) { - prefix = 'https://franklin.library.upenn.edu/redir/ill?requesttype=ScanDelivery'; - if (openUrlTemplate != null && openUrlTemplate.startsWith(prefix)) { - appendOpenUrlParams = openUrlTemplate.slice(prefix.length); - } else { - appendOpenUrlParams = ''; - } + } + if ((registeredFacEx === false || booksByMailOption != null) && (!request_context.monograph || !request_context.hathi_etas)) { + // assume first querystring param is 'requesttype=[...]' -- subsequent options (preceded by '&') should be openUrl params + var startOpenUrlParams = openUrlTemplate === null ? -1 : openUrlTemplate.indexOf('&'); + if (startOpenUrlParams < 0) { + appendOpenUrlParams = ''; + } else { + appendOpenUrlParams = openUrlTemplate.slice(startOpenUrlParams); + } + if (registeredFacEx === false) { data.push({ option_name: 'FacultyEXPRESS', option_url: 'https://franklin.library.upenn.edu/forms/ill?requesttype=book' + appendOpenUrlParams, highlightable: true }); } + if (booksByMailOption != null) { + booksByMailOption['option_url'] = 'https://franklin.library.upenn.edu/forms/ill?requesttype=book&deliverytype=bbm' + appendOpenUrlParams; + } } // Remove once request option API is fixed From 2137253a7b97376a0143be709e081e1b43d34849 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Tue, 14 Jul 2020 17:14:50 -0400 Subject: [PATCH 056/114] add comment about BBM ILL link conjuring --- app/assets/javascripts/availability.js.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index 53a875ab..18cde00f 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -266,6 +266,11 @@ $(document).ready(function() { }); } if (booksByMailOption != null) { + // NOTE: we're conjuring an ILL link that would normally be generated by Alma, but is not now (COVID-19) because + // ILL-proper is disabled. Despite appearances, 80% confident that requesttype should always be "book" (e.g., even + // for "journals"), because "book" differentiates from things like reprographic requests, _not_ actually based on + // bibliographic material type. 'deliverytype=bbm' is handled in the ill form (franklinforms) to prepend "BBM " to + // otherwise-normal ILL requests (saving staff manually doing so); such ILL requests are then handled as BBM requests. booksByMailOption['option_url'] = 'https://franklin.library.upenn.edu/forms/ill?requesttype=book&deliverytype=bbm' + appendOpenUrlParams; } } From 271c224274dcaa241d86f5ade0ffb5e0149f8e93 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 20 Jul 2020 09:47:45 -0400 Subject: [PATCH 057/114] reenable Aeon link if not (monograph && hathi_etas) --- app/assets/javascripts/availability.js.erb | 17 ++++++++++++----- app/controllers/franklin_alma_controller.rb | 3 +-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/availability.js.erb b/app/assets/javascripts/availability.js.erb index ebdd9cde..91eef33e 100644 --- a/app/assets/javascripts/availability.js.erb +++ b/app/assets/javascripts/availability.js.erb @@ -28,9 +28,10 @@ $(document).ready(function() { return ctx.monograph && (ctx.pickupable === false || ctx.hathi_etas /*|| ctx.hathi_pd*/); } - function constructAeonLink(mmsid, holding) { - // TODO: remove this line once the libraries are open again - return null; + function constructAeonLink(mmsid, holding, ctx) { + if (ctx.hathi_etas && ctx.monograph) { + return null; + } if(holding['link_to_aeon']) { return 'Request to view'; @@ -48,12 +49,18 @@ $(document).ready(function() { if (holding['availability'] == 'check_holdings') { availability = "See options"; } else if (holding['availability'] == 'unavailable') { - availability = "Unavailable";//"See request options"; + // pre-COVID-19 always mapped to "See request options"; + if (holding['link_to_aeon']) { + // Aeon materials show as "unavailable", but not in the sense of being unviewable. + availability = (ctx.hathi_etas && ctx.monograph) ? "Restricted (COVID-19)" : "See request options"; + } else { + availability = "Unavailable"; + } } else if (holding['availability'] == 'available') { availability = disable_pickup_at_penn(ctx) ? "Restricted (COVID-19)" : "Available"; } // TODO: pass in format to shelfLocatorLink() somehow - return [availability, holding['location'], holding['call_number'], $.shelfLocatorLink(mms_id, holding, "TODO"), constructAeonLink(mms_id, holding)] + return [availability, holding['location'], holding['call_number'], $.shelfLocatorLink(mms_id, holding, "TODO"), constructAeonLink(mms_id, holding, ctx)] .filter(function (item) { return item != null && item.length > 0; }).join(". "); diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 707d0f5f..0a66ec4d 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -223,8 +223,7 @@ def single_availability holding_pickupable = holding['availability'] == 'available' pickupable = true if holding_pickupable links = [] -# TODO: Uncomment when libraries reopen - #links << "Request to view in reading room" if holding['link_to_aeon'] + links << "Request to view in reading room" if holding['link_to_aeon'] unless (ctx['hathi_etas'] && ctx['monograph']) holding['availability'] = availability_status[holding['availability']] || 'Requestable' if has_holding_info From fdc02a32b7762d172750914508608250f270eac5 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Mon, 20 Jul 2020 10:37:58 -0400 Subject: [PATCH 058/114] fix logic error re: FacultyExpress --- app/controllers/franklin_alma_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/franklin_alma_controller.rb b/app/controllers/franklin_alma_controller.rb index 0a66ec4d..c056e8b2 100644 --- a/app/controllers/franklin_alma_controller.rb +++ b/app/controllers/franklin_alma_controller.rb @@ -246,7 +246,7 @@ def single_availability if userid == 'GUEST' holding['availability'] = 'Log in & request below' else - if suppress_pickup_at_penn(ctx) || session['user_group'] == 'Faculty Express' + if suppress_pickup_at_penn(ctx) && session['user_group'] != 'Faculty Express' # we're temporarily disabling all request options for non facex holding['availability'] = 'Not on shelf' else From 41fbacfe424b64291a79a2e8c448c5f6004d0018 Mon Sep 17 00:00:00 2001 From: Mike Kanning Date: Thu, 30 Jul 2020 14:28:46 -0400 Subject: [PATCH 059/114] don't render database index page results on homepage load. alter search bar button link for databases to be a simple link to database results. --- app/helpers/application_helper.rb | 6 ++++++ app/views/catalog/_franklin_search_bar.html.erb | 2 +- app/views/catalog/landing.html.erb | 3 --- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4e7a0ebd..e0da310d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -9,6 +9,12 @@ def summon_url(query, proxy = false) end end + # Path for a BL catalog index page with Databases facet applied + # @return [String] + def databases_results_path + 'catalog?utf8=✓&search_field=keyword&f%5Bformat_f%5D%5B%5D=Database+%26+Article+Index&q=' + end + def databases_results_url(query) if !params.dig('f', 'format_f')&.include?('Database & Article Index') url = path_for_facet('format_f', 'Database & Article Index') diff --git a/app/views/catalog/_franklin_search_bar.html.erb b/app/views/catalog/_franklin_search_bar.html.erb index 41878389..cbaa6f49 100644 --- a/app/views/catalog/_franklin_search_bar.html.erb +++ b/app/views/catalog/_franklin_search_bar.html.erb @@ -43,7 +43,7 @@
    From 6863ccf853099afe4aa0c8c1838ca5029e67ab66 Mon Sep 17 00:00:00 2001 From: Mike Kanning Date: Thu, 30 Jul 2020 14:37:57 -0400 Subject: [PATCH 060/114] update README with corrected Ruby version info --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e760d1b3..8ebae366 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,10 @@ Installation: - Checkout this repo. -- Make sure you have ruby 2.3.1 installed. It's recommended that you +- Make sure you have ruby 2.3.3 installed. It's recommended that you use [rbenv](https://github.com/rbenv/rbenv), but it may be quicker/easier to get running with [rvm](https://rvm.io/). + - You may have issues installing Ruby 2.3.3 in recent Linux distributions due to an OpenSSL version incompatibility. See [this guide](https://www.garron.me/en/linux/install-ruby-2-3-3-ubuntu.html) for help. - Run `bundle install` to install all gem dependencies. From 82ff4cb619050ad00f699d9bb9a54f9c6c664087 Mon Sep 17 00:00:00 2001 From: Michael Gibney Date: Wed, 5 Aug 2020 10:49:23 -0400 Subject: [PATCH 061/114] hotfix for NPE in database bento (analogous to 04dbe1ae24a3ecc88116cd06d76bcc4bef3eb3b4) --- app/search_engines/bento_search/databases_engine.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/search_engines/bento_search/databases_engine.rb b/app/search_engines/bento_search/databases_engine.rb index d808e110..7a98fb2b 100644 --- a/app/search_engines/bento_search/databases_engine.rb +++ b/app/search_engines/bento_search/databases_engine.rb @@ -58,8 +58,13 @@ def search_implementation(args) summary = Hash.from_xml(Nokogiri::XML(entry['summary']).to_xml) - list_terms = summary['dl']['dt'].respond_to?(:each) ? summary['dl']['dt'] : [summary['dl']['dt']] - list_definitions = summary['dl']['dd'].respond_to?(:each) ? summary['dl']['dd'] : [summary['dl']['dd']] + if summary.nil? || !summary['dl'] + list_terms = [] + list_definitions = []; + else + list_terms = summary['dl']['dt'].respond_to?(:each) ? summary['dl']['dt'] : [summary['dl']['dt']] + list_definitions = summary['dl']['dd'].respond_to?(:each) ? summary['dl']['dd'] : [summary['dl']['dd']] + end list_terms.each_with_index do |term, index| case term.downcase[0..term.length-2] From 059f173515a712e14aa8bdae56549af1ee9afabf Mon Sep 17 00:00:00 2001 From: Mike Kanning Date: Wed, 5 Aug 2020 14:51:29 -0500 Subject: [PATCH 062/114] retain q param when constructing database search path in search bar --- app/helpers/application_helper.rb | 5 +++-- app/views/catalog/_franklin_search_bar.html.erb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e0da310d..74b854f6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -11,8 +11,9 @@ def summon_url(query, proxy = false) # Path for a BL catalog index page with Databases facet applied # @return [String] - def databases_results_path - 'catalog?utf8=✓&search_field=keyword&f%5Bformat_f%5D%5B%5D=Database+%26+Article+Index&q=' + # @param [String] query param + def databases_results_path(query) + "catalog?utf8=✓&search_field=keyword&f%5Bformat_f%5D%5B%5D=Database+%26+Article+Index&q=#{url_encode(query)}" end def databases_results_url(query) diff --git a/app/views/catalog/_franklin_search_bar.html.erb b/app/views/catalog/_franklin_search_bar.html.erb index cbaa6f49..396f8046 100644 --- a/app/views/catalog/_franklin_search_bar.html.erb +++ b/app/views/catalog/_franklin_search_bar.html.erb @@ -43,7 +43,7 @@
    + +
    + +
    +
    +

    Colenda

    + <%= bento_search 'colenda', :query => params[:q] || '', :load => :ajax_auto %>
    <%= render_expert_help(@response.aggregations["subject_specialists"]) %> @@ -62,4 +70,3 @@
    - diff --git a/app/views/layouts/_colenda_ajax_results_wrapper.html.erb b/app/views/layouts/_colenda_ajax_results_wrapper.html.erb new file mode 100644 index 00000000..b0166f50 --- /dev/null +++ b/app/views/layouts/_colenda_ajax_results_wrapper.html.erb @@ -0,0 +1,14 @@ +
    + <%= link_to "View and filter #{number_with_delimiter(results.total_items)} #{results.total_items != 1 ? 'results' : 'result'}", databases_results_url(params[:q] || params[:query]) %> +
    + +<%= yield %> + +<% if results.total_items > 0 %> +
    + <%= link_to(("View all results #{image_tag('view_all_arrow.png', :alt => '')}").html_safe, databases_results_url(params[:q] || params[:query])) %> +
    +<% end %> + +
    +
    diff --git a/app/views/layouts/_hide_colenda_zero_results.html.erb b/app/views/layouts/_hide_colenda_zero_results.html.erb new file mode 100644 index 00000000..d87d1eec --- /dev/null +++ b/app/views/layouts/_hide_colenda_zero_results.html.erb @@ -0,0 +1,6 @@ + diff --git a/config/initializers/bento_search.rb b/config/initializers/bento_search.rb index c368088d..b4cb122e 100644 --- a/config/initializers/bento_search.rb +++ b/config/initializers/bento_search.rb @@ -56,6 +56,15 @@ end end +BentoSearch.register_engine('colenda') do |conf| + conf.engine = 'BentoSearch::ColendaEngine' + conf.allow_routable_results = true + conf.for_display do |display| + display[:ajax] = { 'wrapper_template' => 'layouts/colenda_ajax_results_wrapper' } + display[:no_results_partial] = 'layouts/hide_colenda_zero_results' + end +end + BentoSearch.register_engine('catalog') do |conf| conf.engine = 'BentoSearch::CatalogEngine' conf.allow_routable_results = true From 3a12e5de489b4e6fd3bdffdd3e23959478f62dde Mon Sep 17 00:00:00 2001 From: Iva Goldsmith Date: Tue, 26 May 2020 15:46:19 -0400 Subject: [PATCH 067/114] Add colenda tab --- app/helpers/application_helper.rb | 8 ++++++++ app/views/catalog/_franklin_search_bar.html.erb | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f8bd86d6..cc3dee40 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -23,6 +23,10 @@ def google_site_search_results_url(query) return "https://www.library.upenn.edu/search/web-pages?q=#{query}" end + def colenda_search_results_url(query) + return "https://colenda.library.upenn.edu/catalog?q=#{query}" + end + def catalog_results_url(query) return search_catalog_path(q: query, search_field: 'keyword') end @@ -65,6 +69,10 @@ def render_tab_link(tab_id, tab_label, anchor, url, data_target) attrs = { 'href': "http://www.library.upenn.edu/search/web-pages" } + elsif tab_id == 'colenda' && action_name == 'landing' + attrs = { + 'href': "https://colenda.library.upenn.edu" + } else attrs = { 'href': anchor, diff --git a/app/views/catalog/_franklin_search_bar.html.erb b/app/views/catalog/_franklin_search_bar.html.erb index 396f8046..89e0f086 100644 --- a/app/views/catalog/_franklin_search_bar.html.erb +++ b/app/views/catalog/_franklin_search_bar.html.erb @@ -46,6 +46,11 @@ <%= link_to 'Databases', databases_results_path(params[:q]) %> +