+
@@ -11,10 +11,10 @@
<%= link_to "View and filter #{number_with_delimiter(@response.total)} #{@response.total != 1 ? 'results' : 'result'}", search_catalog_path(q: params[:q] || params[:query], search_field: 'keyword') %>
- <%= bento_search 'catalog', :query => params[:q] || '', :per_page => 5, :load => :ajax_auto %>
+ <%= bento_search 'catalog', :query => params[:q] || '', :load => :ajax_auto %>
-
+
@@ -22,44 +22,53 @@
<%= bento_search 'summon', :query => params[:q] || '', :per_page => 5, :load => :ajax_triggered %>
-
-
-
-
-
Databases
- <%= bento_search 'databases', :query => params[:q] || '', :per_page => 5, :load => :ajax_auto, :f_term => 'format_f', :f_value => 'Database & Article Index' %>
-
-
- <%= render_expert_help(@response.aggregations["subject_specialists"]) %>
+
+
+
+
+
+
Databases
+ <%= bento_search 'databases', :query => params[:q] || '', :load => :ajax_auto %>
+
-
-
-
-
-
Library website
-
- <%= link_to "View all results", google_site_search_results_url(params[:q] || params[:query]) %>
+
+
+
+
+
Colenda <%=link_to("(What is Colenda?)", "https://colenda.library.upenn.edu/pages/about", class: "colenda-help") %>
+ <%= bento_search 'colenda', :query => params[:q] || '', :load => :ajax_auto %>
-
-
+ <%= render_expert_help(@response.aggregations["subject_specialists"]) %>
-
- <%= link_to(("View all results #{image_tag('view_all_arrow.png', :alt => '')}").html_safe, google_site_search_results_url(params[:q] || params[:query])) %>
-
+
+
+
+
+
Library website
+
+ <%= link_to "View all results", google_site_search_results_url(params[:q] || params[:query]) %>
+
+
+
+
+
+ <%= link_to(("View all results #{image_tag('view_all_arrow.png', :alt => '')}").html_safe, google_site_search_results_url(params[:q] || params[:query])) %>
+
+
+
-
diff --git a/app/views/catalog/landing.html.erb b/app/views/catalog/landing.html.erb
index 217dc7b0..4a59cc76 100644
--- a/app/views/catalog/landing.html.erb
+++ b/app/views/catalog/landing.html.erb
@@ -8,7 +8,4 @@
<%= render partial: 'landing_articles' %>
-
- <%= render partial: 'landing_databases' %>
-
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..36fded7a
--- /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'}", colenda_search_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, colenda_search_results_url(params[:q] || params[:query])) %>
+
+<% end %>
+
+
+
diff --git a/app/views/layouts/_databases_ajax_results_wrapper.html.erb b/app/views/layouts/_databases_ajax_results_wrapper.html.erb
index eaa40831..9cfe2d61 100644
--- a/app/views/layouts/_databases_ajax_results_wrapper.html.erb
+++ b/app/views/layouts/_databases_ajax_results_wrapper.html.erb
@@ -1,12 +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]) %>
+ <%= link_to "View and filter #{number_with_delimiter(results.total_items)} #{'results'.pluralize(results.total_items)}",
+ databases_results_path(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])) %>
+ <%= link_to(("View all results #{image_tag('view_all_arrow.png', alt: '')}").html_safe,
+ databases_results_path(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..e69de29b
diff --git a/app/views/layouts/_hide_databases_zero_results.html.erb b/app/views/layouts/_hide_databases_zero_results.html.erb
index b8ef7bc2..e69de29b 100644
--- a/app/views/layouts/_hide_databases_zero_results.html.erb
+++ b/app/views/layouts/_hide_databases_zero_results.html.erb
@@ -1,6 +0,0 @@
-
\ No newline at end of file
diff --git a/app/views/layouts/blacklight.html.erb b/app/views/layouts/blacklight.html.erb
index 3b03ed7d..f45dc8e4 100644
--- a/app/views/layouts/blacklight.html.erb
+++ b/app/views/layouts/blacklight.html.erb
@@ -50,10 +50,6 @@
<%= content_tag :h1, application_name, class: 'sr-only application-heading' %>
<%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %>
-
<%= yield %>
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 @@
-
-
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b88c5354..b4d82d82 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -52,7 +52,7 @@
config.logger = Logger.new(STDOUT)
# Use a different cache store in production.
- # config.cache_store = :mem_cache_store
+ config.cache_store = :memory_store, { size: 4.megabytes }
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.action_controller.asset_host = 'http://assets.example.com'
diff --git a/config/honeybadger.yml b/config/honeybadger.yml
new file mode 100644
index 00000000..532b13c6
--- /dev/null
+++ b/config/honeybadger.yml
@@ -0,0 +1,2 @@
+---
+api_key: <%= ENV['HONEYBADGER_API_KEY'] %>
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
diff --git a/config/translation_maps/locations.xml b/config/translation_maps/locations.xml
index f19a5d7b..3614b704 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
@@ -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
@@ -1026,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
@@ -1051,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
@@ -1126,6 +1136,7 @@
On Order
Health Sciences Libraries
+ Veterinary
Veterinary: du Pont Library (New Bolton)
Ordered for New Bolton Library
@@ -1147,6 +1158,7 @@
On Order
Health Sciences Libraries
+ Veterinary
Ordered for Veterinary: Atwood Library (Campus)
@@ -1635,6 +1647,11 @@
LIBRA
LIBRA - Circulation
+
+ LIBRA - Course Text
+ LIBRA
+ LIBRA - Course Text
+
LIBRA Fisher Fine Arts
LIBRA
@@ -1740,42 +1757,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
@@ -1783,6 +1807,7 @@
Veterinary: Atwood Library (Campus) - Reserve Oversize
Health Sciences Libraries
+ Veterinary
Veterinary: Atwood Library (Campus)
Reserve
Veterinary: Atwood Library (Campus) - Reserve Oversize
diff --git a/config/translation_maps/subject_specialists.solr-json b/config/translation_maps/subject_specialists.solr-json
index 65e52657..6cda0010 100644
--- a/config/translation_maps/subject_specialists.solr-json
+++ b/config/translation_maps/subject_specialists.solr-json
@@ -1,23 +1,37 @@
+# inline comments are supported for the purpose of documenting these sometimes-convoluted
+# queries inline. The comments are somewhat naively stripped out when read
+# into ruby. This means that if you need to use a literal '#' for some reason,
+# you'll have to make special accommodations at the point where this file is read
+# into ruby. For now, we're not going to support literal '#' speculatively ...
+
{
subject_specialists: {
+ # the only purpose served by this top-level of hierarchy is to group the nested facet
+ # queries, where the real "work" happens. This allows them to be easily parsed, disabled,
+ # etc. as a group.
type: query,
q: '*:*',
facet:{
accounting : {
type: query,
- q: "{!term f=subject_search v=accounting}",
+ # this domain (and some others) are implicitly focused on more recent content. The
+ # post_1928 filter is a somewhat arbitrary date restriction to narrow the focus of
+ # these domains; $post_1928 query is defined in catalog controller, default solr params
+ q: "{!bool filter='{!term f=subject_search v=accounting}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- africana : {
+ africana_studies : {
+ # "africana" is a general term that is more likely to appear in the record at large
+ # than in an official "subject" field, so we inspect the catch-all marcrecord_xml field
type: query,
q: "{!term f=marcrecord_xml v=africana}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- african : {
+ african_studies : {
type: query,
q: "{!term f=subject_search v=africa}",
facet: {
@@ -40,27 +54,29 @@
},
architectural_history : {
type: query,
+ # prefix searches on subject_f are good for capturing a heading and all associated subheadings
q: "{!prefix f=subject_f v=Architecture--History}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- architecture_city_planning : {
+ architecture_amp_city_planning : {
type: query,
q: "{!bool filter='{!term f=subject_search v=architecture}' filter='{!term f=subject_search v=planning}' filter='{!term f=subject_search v=city}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- art_history : {
+ art_amp_art_history : {
type: query,
q: "{!prefix f=subject_f v=Art--History}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- asian_american : {
+ asian_american_studies : {
type: query,
+ # "double quoted" search yields a phrase search
q: "{!field f=subject_search v='\"asian american\"'}",
facet: {
r1 : "relatedness($combo,$back)"
@@ -82,12 +98,13 @@
},
biology : {
type: query,
- q: "{!term f=subject_search v=biology}",
+ # see comment about $post_1928 under entry for "accounting"
+ q: "{!bool filter='{!term f=subject_search v=biology}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- biomedical_grad : {
+ biomedical_graduate_studies : {
type: query,
q: "{!term f=subject_search v=biomedical}",
facet: {
@@ -101,7 +118,7 @@
r1 : "relatedness($combo,$back)"
}
},
- business_economics_policy : {
+ business_economics_amp_public_policy : {
type: query,
q: "{!bool filter='{!term f=subject_search v=business}' filter='{!term f=subject_search v=public}' filter='{!term f=subject_search v=policy}'}",
facet: {
@@ -110,26 +127,26 @@
},
chemistry : {
type: query,
- q: "{!term f=subject_search v=chemistry}",
+ q: "{!bool filter='{!term f=subject_search v=chemistry}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- chinese : {
+ chinese_studies : {
type: query,
q: "{!terms f=subject_search v='china,chinese'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- cinema_media : {
+ cinema_amp_media_studies : {
type: query,
- q: "{!bool should='{!term f=subject_search v=cinema}' should='{!term f=subject_search v=media}'}",
+ q: "{!bool should='{!complexphrase df=subject_search v=\\'\"motion (picture pictures)\"\\'}' should='{!terms f=subject_search v=media,cinema}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- classics : {
+ classical_studies : {
type: query,
q: "{!bool should='{!prefix f=subject_f v=Classical}' should='{!term f=language_f v=Latin}' should='{!term f=language_f v=\\'Greek, Ancient (to 1453)\\'}'}",
facet: {
@@ -138,7 +155,7 @@
},
communication : {
type: query,
- q: "{!term f=subject_search v=communication}",
+ q: "{!bool filter='{!term f=subject_search v=communication}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
@@ -152,19 +169,19 @@
},
criminology : {
type: query,
- q: "{!term f=subject_search v=criminology}",
+ q: "{!bool filter='{!term f=subject_search v=criminology}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- dental : {
+ dental_medicine : {
type: query,
- q: "{!prefix f=subject_f v='Dentistry'}",
+ q: "{!bool filter='{!prefix f=subject_f v=Dentistry}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- earth_environmental_science : {
+ earth_amp_environmental_science : {
type: query,
q: "{!bool should='{!prefix f=subject_f v=\\'Earth sciences\\'}' should='{!prefix f=subject_f v=\\'Environmental sciences\\'}'}",
facet: {
@@ -180,12 +197,12 @@
},
education : {
type: query,
- q: "{!term f=subject_search v=education}",
+ q: "{!bool filter='{!term f=subject_search v=education}' must_not='{!term f=subject_f v=\\'Health education\\'}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- engineering_and_cs : {
+ engineering_amp_computer_science : {
type: query,
q: "{!bool should='{!term f=subject_search v=engineering}' should='{!prefix f=subject_f v=\\'Computer \\'}'}",
facet: {
@@ -194,14 +211,14 @@
},
entrepreneurship : {
type: query,
- q: "{!term f=subject_search v=entrepreneurship}",
+ q: "{!bool filter='{!term f=subject_search v=entrepreneurship}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
},
finance : {
type: query,
- q: "{!term f=subject_search v=finance}",
+ q: "{!bool filter='{!term f=subject_search v=finance}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
@@ -213,58 +230,61 @@
r1 : "relatedness($combo,$back)"
}
},
- folk : {
+ folklore_amp_folklife : {
type: query,
q: "{!bool should='{!prefix f=subject_f v=Folklore}' should='{!prefix f=subject_f v=Ethnology}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- french : {
+ french_language_amp_literature : {
type: query,
- q: "{!bool filter='{!term f=subject_search v=french}' should='{!term f=subject_search v=language}' should='{!term f=subject_search v=literature}'}",
+ # match on "filter" clause means that no "should" clauses need to match; so we have to bundle the
+ # "should" clauses together as a top-level "filter" clause
+ q: "{!bool filter='{!term f=subject_search v=french}' filter='{!bool should=\\'{!term f=subject_search v=language}\\' should=\\'{!term f=subject_search v=literature}\\'}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- gender : {
+ gender_sexuality_amp_women039s_studies : {
type: query,
q: "{!bool should='{!term f=subject_search v=gender}' should='{!term f=subject_search v=sexuality}' should='{!prefix f=subject_f v=\\'Women\\\\\\'s studies\\'}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- science : {
+ general_science : {
type: query,
- q: "{!prefix f=subject_f v=Science}",
+ q: "{!bool filter='{!prefix f=subject_f v=Science}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- gis : {
+ geographic_information_systems : {
type: query,
q: "{!prefix f=subject_f v='Geographic information systems'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- germanic : {
+ germanic_languages_amp_literatures : {
type: query,
- q: "{!bool filter='{!prefix f=subject_search v=german}' should='{!prefix f=subject_search v=language}' should='{!term f=subject_search v=literature}'}",
+ # see comment on mixed "filter" and "should" clauses under "french...", above
+ q: "{!bool filter='{!prefix f=subject_search v=german}' filter='{!bool should=\\'{!prefix f=subject_search v=language}\\' should=\\'{!term f=subject_search v=literature}\\'}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
health_care_management : {
type: query,
- q: "{!bool filter='{!term f=subject_search v=health}' filter='{!term f=subject_search v=care}' should='{!term f=subject_search v=management}' should='{!term f=subject_search v=economics}'}",
+ q: "{!bool filter='{!term f=subject_search v=health}' filter='{!term f=subject_search v=care}' filter='{!terms f=subject_search v=management,economics}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
historic_preservation : {
type: query,
- q: "{!bool filter='{!term f=subject_search v=historic}' should='{!term f=subject_search v=preservation}' should='{!term f=subject_search v=conservation}' should='{!term f=subject_search v=restoration}'}",
+ q: "{!bool filter='{!term f=subject_search v=historic}' filter='{!bool should=\\'{!term f=subject_search v=preservation}\\' should=\\'{!term f=subject_search v=conservation}\\' should=\\'{!term f=subject_search v=restoration}\\'}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
@@ -276,15 +296,19 @@
r1 : "relatedness($combo,$back)"
}
},
- history_sociology_of_science : {
+ history_amp_sociology_of_science : {
type: query,
+ # loose/"sloppy" proximity search is the most efficient way to catch the relevant subjects here, so we use edismax
+ # "political" caused a bunch of spurious matches, so we blacklist it
q: "{!bool should='{!edismax qf=subject_search pf=subject_search v=\\'\"sociology science\"~5\\'}' should='{!edismax qf=subject_search pf=subject_search v=\\'\"history science\"~5\\'}' must_not='{!term f=subject_search v=political}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- humanities : {
+ humanities_general : {
type: query,
+ # this is a huge domain, by design. But correlation will account for that and should
+ # only match this domain for very broad queries
q: "{!terms f=subject_search v=anthropology,archaeology,classical,history,linguistics,language,law,politics,literature,philosophy,religion,art}",
facet: {
r1 : "relatedness($combo,$back)"
@@ -292,7 +316,7 @@
},
international_business : {
type: query,
- q: "{!bool filter='{!term f=subject_search v=international}' filter='{!term f=subject_search=business}'}",
+ q: "{!bool filter='{!term f=subject_search v=international}' filter='{!term f=subject_search=business}' filter=$post_1928}",
facet: {
r1 : "relatedness($combo,$back)"
}
@@ -304,14 +328,14 @@
r1 : "relatedness($combo,$back)"
}
},
- italian : {
+ italian_language_amp_literature : {
type: query,
- q: "{!bool filter='{!term f=subject_search v=italian}' should='{!term f=subject_search v=language}' should='{!term f=subject_search v=literature}'}",
+ q: "{!bool filter='{!term f=subject_search v=italian}' filter='{!bool should=\\'{!term f=subject_search v=language}\\' should=\\'{!term f=subject_search v=literature}\\'}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- japanese : {
+ japanese_studies : {
type: query,
q: "{!terms f=subject_search v=japan,japanese}",
facet: {
@@ -320,47 +344,52 @@
},
judaica_special_collections : {
type: query,
- q: "{!bool filter='{!term f=library_f v=\\'Special Collections\\'}' filter='{!terms f=subject_search v=jews,jewish}'}",
+ q: "{!bool filter='{!term f=library_f v=\\'Special Collections\\'}' filter='{!terms f=subject_search v=judaism,jews,jewish}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- judaic : {
+ judaic_studies : {
type: query,
- q: "{!terms f=subject_search v=jews,jewish}",
+ # $culture_filter covers various markers pertaining to culture. It is general enough to be reused elsewhere
+ # (e.g., perhaps for the "language & literature" domains, though for now these are defined specifically wrt
+ # "language" and "literature"
+ # NOTE: better results were achieved with the more targeted "Jewish" prefix search than were achieved via
+ # simply including "jewish" in the "terms" query.
+ q: "{!bool filter='{!bool should=\\'{!terms f=subject_search v=judaism,jews}\\' should=\\'{!prefix f=subject_f v=Jewish}\\'}' filter=$culture_filter}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- korean : {
+ korean_studies : {
type: query,
q: "{!terms f=subject_search v=korea,korean}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- lanscape_architecture : {
+ landscape_architecture : {
type: query,
q: "{!bool filter='{!term f=subject_search v=landscape}' filter='{!term f=subject_search v=architecture}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- latin_america : {
+ latin_american_studies : {
type: query,
q: "{!prefix f=subject_f v='Latin America'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- latino : {
+ latino_studies : {
type: query,
q: "{!terms f=subject_search v=hispanic,latino}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- legal_business_ethics : {
+ legal_studies_amp_business_ethics : {
type: query,
q: "{!bool should='{!terms f=subject_search v=legal,law,laws}' should='{!bool filter=\\'{!term f=subject_search v=business}\\' filter=\\'{!term f=subject_search v=ethics}\\'}'}",
facet: {
@@ -376,19 +405,21 @@
},
literature_in_english : {
type: query,
- q: "{!bool should='{!term f=language_f v=English}' should='{!term f=subject_search v=english}' filter='{!term f=subject_search v=literature}'}",
+ q: "{!bool filter='{!bool should=\\'{!term f=language_f v=English}\\' should=\\'{!term f=subject_search v=english}\\'}' filter='{!term f=subject_search v=literature}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
management : {
type: query,
+ # opted *not* to explicitly filter to $post_1928 here; unlike for "accounting" and "biology",
+ # this term should effectively self-select to more modern materials without extra filtering
q: "{!term f=subject_search v=management}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- manuscripts : {
+ manuscript_studies : {
type: query,
q: "{!terms f=subject_search v=manuscript,manuscripts}",
facet: {
@@ -397,56 +428,61 @@
},
marketing : {
type: query,
- q: "{!term f=subject_search v=marketing}",
+ q: "{!bool filter='{!term f=subject_search v=marketing}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- math : {
+ mathematics : {
type: query,
- q: "{!term f=subject_search v=mathematics}",
+ q: "{!bool filter='{!term f=subject_search v=mathematics}' filter=$post_1928}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
medicine : {
type: query,
- q: "{!term f=subject_search v=medicine}",
+ q: "{!bool filter='{!term f=subject_search v=medicine}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
},
medieval_manuscripts : {
type: query,
- q: "{!bool filter='{!term f=subject_search v=medieval}' filter='{!terms f=subject_search v=manuscript,manuscripts}'}",
+ # somewhat arbitrary date range delimiting "medieval" from "modern" mss.
+ # per fraas, early renaissance mss are usually bundled with medieval, hence
+ # the magic 1600 date
+ q: "{!bool filter='{!bool should=\\'{!term f=subject_search v=medieval}\\' should=\\'content_min_dtsort:[* TO 1600-01-01T00:00:00Z]\\'}' filter='{!terms f=subject_search v=manuscript,manuscripts}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
medieval_studies : {
type: query,
- q: "{!term f=subject_search v=medieval}",
+ # see note above ("medieval manuscripts") wrt somewhat-arbitrary date range filter
+ q: "{!bool should='{!term f=subject_search v=medieval}' should='content_min_dtsort:[* TO 1600-01-01T00:00:00Z]'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- middle_east : {
+ middle_eastern_studies : {
type: query,
q: "{!prefix f=subject_f v='Middle East'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- modern_manuscripts_archives : {
+ modern_manuscripts_amp_archives : {
type: query,
- q: "{!bool should='{!terms f=subject_search v=archive,archives}' should='{!bool filter=\\'{!term f=subject_search v=modern}\\' filter=\\'{!terms f=subject_search v=manuscript,manuscripts}\\'}'}",
+ # see note above (under "medieval_manuscripts") re: arbitrary dividing line between "medieval+" and "modern"
+ q: "{!bool filter='{!bool should=\\'{!term f=format_f v=Archive}\\' should=\\'{!terms f=subject_search v=manuscript,manuscripts}\\'}' filter='content_max_dtsort:[1601-01-01T00:00:00Z TO *]'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
music : {
type: query,
- q: "{!term f=subject_search v=music}",
+ q: "{!bool should='{!term f=subject_search v=music}' should='{!terms f=format_f v=\\'Sound recording,Musical score\\'}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
@@ -465,7 +501,7 @@
r1 : "relatedness($combo,$back)"
}
},
- operations_decisions : {
+ operations_information_amp_decisions : {
type: query,
q: "{!bool should='{!prefix f=subject_f v=\\'Operations research\\'}' should='{!prefix f=subject_f v=\\'Decision making\\'}'}",
facet: {
@@ -486,14 +522,14 @@
r1 : "relatedness($combo,$back)"
}
},
- philosophy_politics_economics : {
+ philosophy_politics_amp_economics : {
type: query,
q: "{!bool filter='{!term f=subject_search v=philosophy}' filter='{!terms f=subject_search v=politics,political,economic,economics}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- physics_astronomy : {
+ physics_amp_astronomy : {
type: query,
q: "{!bool should='{!terms f=subject_search v=physics,astronomy}' should='{!prefix f=subject_f v=Astrophysic}'}",
facet: {
@@ -509,7 +545,7 @@
},
political_science_data : {
type: query,
- q: "{!bool filter='{!prefix f=subject_f v=\\'Political science\\'}' filter='{!term f=subject_search v=data}'}",
+ q: "{!bool filter='{!prefix f=subject_search v=politic}' filter='{!term f=subject_search v=data}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
@@ -521,16 +557,18 @@
r1 : "relatedness($combo,$back)"
}
},
- rare_books : {
+ rare_books_amp_printed_materials : {
type: query,
- q: "{!bool should='{!bool must=\\'{!term f=library_f v=\\\\\\'Special Collections\\\\\\'}\\' must_not=\\'{!term f=format_f v=Manuscript}\\'}' should='{!prefix f=subject_f v=\\'Rare books\\'}'}",
+ # per fraas, location-based domain should be ok. This will not be perfect for all cases, but
+ # "perfect for all cases" is not an attainable goal ...
+ q: "{!bool should='{!bool filter=\\'{!term f=library_f v=\\\\\\'Special Collections\\\\\\'}\\' must_not=\\'{!term f=format_f v=Manuscript}\\'}' should='{!prefix f=subject_f v=\\'Rare books\\'}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
real_estate : {
type: query,
- q: "{!bool should='{!prefix f=subject_f v=\\'Real estate\\'}' should='{!prefix f=subject_f v=\\'Real property\\'}'}",
+ q: "{!bool filter='{!complexphrase df=subject_search v=\\'\"real (estate property)\"\\'}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
@@ -549,37 +587,37 @@
r1 : "relatedness($combo,$back)"
}
},
- romance_languages : {
+ russian_amp_east_european_studies : {
type: query,
- q: "{!field f=subject_search v='\"romance languages\"'}",
+ q: "{!bool should='{!terms f=subject_search v=russia,soviet,slavic,yugoslavia,bosnia,croatia,serbia,ukraine,poland,hungary,czech,belarus}' should='{!terms f=lanuage_f v=Ukranian,Russian,Bosnian,Croatian,Serbian,Belarusian,Hungarian,Czech,Polish}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
scholarly_publishing : {
type: query,
- q: "{!bool must='{!term f=subject_search v=scholarly}' must='{!term f=subject_search v=publishing}'}",
+ q: "{!bool filter='{!term f=subject_search v=scholarly}' filter='{!term f=subject_search v=publishing}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
social_impact : {
type: query,
- q: "{!bool must='{!term f=subject_search v=social}' must='{!terms f=subject_search v=economic,political,business,policy}'}",
+ q: "{!bool filter='{!term f=subject_search v=social}' filter='{!terms f=subject_search v=economic,political,business,policy}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
social_policy : {
type: query,
- q: "{!bool must='{!term f=subject_search v=social}' must='{!terms f=subject_search v=economic,political,business}' must='{!term f=subject_f v=policy}'}",
+ q: "{!bool filter='{!term f=subject_search v=social}' filter='{!terms f=subject_search v=economic,political,business}' filter='{!term f=subject_f v=policy}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
social_science_data : {
type: query,
- q: "{!bool must='{!term f=subject_search v=social}' must='{!terms f=subject_search v=science,sciences}' must='{!terms f=subject_search v=data,methods,methodology,statistical,statistics}'}",
+ q: "{!bool filter='{!term f=subject_search v=social}' filter='{!terms f=subject_search v=science,sciences}' filter='{!terms f=subject_search v=data,methods,methodology,statistical,statistics}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
@@ -598,30 +636,51 @@
r1 : "relatedness($combo,$back)"
}
},
- south_asian : {
+ south_asian_studies : {
type: query,
q: "{!bool should='{!complexphrase df=subject_search v=\\'\"south (asia asian)\"\\'}' should='{!terms f=subject_search v=afghanistan,bangladesh,bhutan,india,maldives,nepal,pakistan}' should='{!field f=subject_search v=\\'\"sri lanka\"\\'}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- spanish_portuguese : {
+ southeast_asian_studies : {
+ type: query,
+ q: "{!bool should='{!complexphrase df=subject_search v=\\'\"southeast (asia asian)\"\\'}' should='{!terms f=subject_search v=cambodia,laos,myanmar,malaysia,thailand,vietnam,indonesia,philippines,singapore}'}'}",
+ facet: {
+ r1 : "relatedness($combo,$back)"
+ }
+ },
+ spanish_portuguese_amp_iberian_studies : {
type: query,
q: "{!bool should='{!terms f=subject_search v=spanish,spain,portuguese,portugal}' should='{!terms f=lanuage_f v=Spanish,Portuguese}'}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- theater : {
+ statistics : {
+ type: query,
+ q: "{!bool filter='{!term f=subject_search v=statistics}' filter=$post_1928 }",
+ facet: {
+ r1 : "relatedness($combo,$back)"
+ }
+ },
+ theatre_arts : {
type: query,
q: "{!term f=subject_search v=theater}",
facet: {
r1 : "relatedness($combo,$back)"
}
},
- veterinary : {
+ urban_studies : {
+ type: query,
+ q: "{!bool filter='{!prefix f=subject_f v=\\'City planning\\'}' filter='{!term f=subject_search v=urban}'}",
+ facet: {
+ r1 : "relatedness($combo,$back)"
+ }
+ },
+ veterinary_medicine : {
type: query,
- q: "{!term f=subject_search v=veterinary}",
+ q: "{!bool filter='{!term f=subject_search v=veterinary}' filter=$post_1928 }",
facet: {
r1 : "relatedness($combo,$back)"
}
diff --git a/lib/blacklight/solr/response/facets.rb b/lib/blacklight/solr/response/facets.rb
index 011fd752..c3d7f94f 100644
--- a/lib/blacklight/solr/response/facets.rb
+++ b/lib/blacklight/solr/response/facets.rb
@@ -13,7 +13,7 @@ def initialize *args
options[:value] = value if value
options[:hits] = hits if hits
-
+
super(options)
end
@@ -25,7 +25,7 @@ def as_json(props = nil)
table.as_json(props)
end
end
-
+
# represents a facet; which is a field and its values
class FacetField
attr_reader :name, :items
@@ -58,14 +58,14 @@ def index?
def count?
sort == 'count'
end
-
+
private
# Per https://wiki.apache.org/solr/SimpleFacetParameters#facet.limit
def solr_default_limit
100
end
-
+
# Per https://wiki.apache.org/solr/SimpleFacetParameters#facet.sort
def solr_default_sort
if limit > 0
@@ -74,7 +74,7 @@ def solr_default_sort
'index'
end
end
-
+
# Per https://wiki.apache.org/solr/SimpleFacetParameters#facet.offset
def solr_default_offset
0
@@ -86,7 +86,7 @@ def solr_default_prefix
end
##
- # Get all the Solr facet data (fields, queries, pivots) as a hash keyed by
+ # Get all the Solr facet data (fields, queries, pivots) as a hash keyed by
# both the Solr field name and/or by the blacklight field name
def aggregations
@aggregations ||= {}.merge(facet_field_aggregations).merge(facet_query_aggregations).merge(facet_pivot_aggregations).merge(facet_json_aggregations)
@@ -114,7 +114,7 @@ def facet_fields
def facet_queries
@facet_queries ||= facet_counts['facet_queries'] || {}
end
-
+
# Returns all of the facet queries
def facet_pivot
@facet_pivot ||= facet_counts['facet_pivot'] || {}
@@ -128,7 +128,7 @@ def facet_json
private
##
- # Convert Solr responses of various json.nl flavors to
+ # Convert Solr responses of various json.nl flavors to
def list_as_hash solr_list
# map
if solr_list.values.first.is_a? Hash
@@ -212,7 +212,7 @@ def facet_query_aggregations
end
##
- # Convert Solr's facet_pivot response into
+ # Convert Solr's facet_pivot response into
# a hash of Blacklight::Solr::Response::Facet::FacetField objects
def facet_pivot_aggregations
facet_pivot.each_with_object({}) do |(field_name, values), hash|
@@ -228,7 +228,7 @@ def facet_pivot_aggregations
end
end
end
-
+
##
# Recursively parse the pivot facet response to build up the full pivot tree
def construct_pivot_field lst, parent_fq = {}
@@ -238,9 +238,9 @@ def construct_pivot_field lst, parent_fq = {}
Blacklight::Solr::Response::Facets::FacetItem.new(value: lst[:value], hits: lst[:count], field: lst[:field], items: items, fq: parent_fq)
end
-
+
##
- # Convert Solr's facet_pivot response into
+ # Convert Solr's facet_pivot response into
# a hash of Blacklight::Solr::Response::Facet::FacetField objects
def facet_json_aggregations
return {} unless blacklight_config
@@ -267,7 +267,7 @@ def facet_json_aggregations
end
end
end
-
+
@@DEFAULT_GET_HITS = lambda { |v| v[:count] }
##
@@ -287,6 +287,6 @@ def construct_subfacet_field field_name, lst, parent_fq = {}, get_hits = @@DEFAU
Blacklight::Solr::Response::Facets::FacetItem.new(value: lst[:val], hits: get_hits.call(lst), field: field_name, items: items, fq: parent_fq)
end
-
-
+
+
end # end Facets
diff --git a/lib/blacklight/solr/response/subject_specialists.rb b/lib/blacklight/solr/response/subject_specialists.rb
deleted file mode 100644
index 869b12d8..00000000
--- a/lib/blacklight/solr/response/subject_specialists.rb
+++ /dev/null
@@ -1,699 +0,0 @@
-module Blacklight::Solr::Response::SubjectSpecialists
- class Constants
-
- SPECIALISTS = {}
-
- SUBJECTS = {}
-
- SPECIALISTS[:hannah_bennett] = { :display_name => 'Hannah Bennett',
- :job_title => 'Director, Fine Arts & Museum Libraries',
- :email => 'hbennett@upenn.edu',
- :phone => '215-573-4635',
- :office => '115 Anne & Jerome Fisher Fine Arts Library',
- :portrait => 'hannah_bennett.jpg',
- :subjects => ['Architecture & city planning',
- 'Art history',
- 'Architectural history',
- 'Fine arts',
- 'Historic preservation',
- 'Landscape architecture',
- 'Urban design'] }
-
- SPECIALISTS[:cathy_ogur] = { :display_name => 'Cathy Ogur',
- :job_title => 'Assistant Director, Lippincott Library',
- :email => 'cogur@wharton.upenn.edu',
- :phone => '215-746-4007',
- :office => '256.2 Van Pelt-Dietrich Library Center',
- :portrait => 'cathy_ogur.jpg',
- :subjects => ['Accounting',
- 'Business economics & public policy',
- 'Entrepreneurship',
- 'Social impact'] }
-
- SPECIALISTS[:nick_okrent] = { :display_name => 'Nick Okrent',
- :job_title => 'Coordinator and Librarian for Humanities Collections',
- :email => 'okrent@pobox.upenn.edu',
- :phone => '215-573-2217',
- :office => '204 Van Pelt-Dietrich Library Center',
- :portrait => 'nick_okrent.jpg',
- :subjects => ['Africana studies',
- 'Asian American studies',
- 'Humanities (general)',
- 'History',
- 'Philosophy',
- 'Philosophy, politics, & economics'] }
-
- SPECIALISTS[:lauris_olson] = { :display_name => 'Lauris Olson',
- :job_title => 'Librarian & Coordinator, Social Sciences Collections',
- :email => 'olson@upenn.edu',
- :phone => '215-898-0119',
- :office => '203 Van Pelt-Dietrich Library Center',
- :portrait => 'lauris_olson.jpg',
- :subjects => ['African Studies',
- 'Communication',
- 'Cultural studies',
- 'Criminology',
- 'Economics',
- 'Geographic information systems',
- 'Government documents - foreign & international',
- 'Government information - United States',
- 'International relations',
- 'Law',
- 'Linguistics',
- 'Political science',
- 'Political science data',
- 'Regional science',
- 'Social science data',
- 'Sociology'] }
-
- SPECIALISTS[:sharon_black] = { :display_name => 'Sharon Black',
- :job_title => 'Annenberg School for Communication Library',
- :email => 'sblack@asc.upenn.edu',
- :phone => '215-898-6106',
- :office => 'Annenberg School for Communication Library',
- :portrait => 'sharon_black.jpg',
- :subjects => ['Communication'] }
-
- SPECIALISTS[:deborah_stewart] = { :display_name => 'Deborah Stewart',
- :job_title => 'Head, John & Ada Lewis Museum Library',
- :email => 'browndeb@upenn.edu',
- :phone => '215-898-4021',
- :office => 'Penn Museum, Academic Wing, 3rd Floor',
- :portrait => 'deborah_stewart.jpg',
- :subjects => ['Anthropology',
- 'Archaeology'] }
-
- SPECIALISTS[:patricia_guardiola] = { :display_name => 'Patricia Guardiola',
- :job_title => 'Assistant Director, Fine Arts Library',
- :email => 'pguar@upenn.edu',
- :phone => '215-573-4637',
- :office => '116 Anne & Jerome Fisher Fine Arts',
- :portrait => 'patricia_guardiola.jpg',
- :subjects => ['Architecture & city planning',
- 'Art history',
- 'Architectural history',
- 'Fine arts',
- 'Historic preservation',
- 'Landscape architecture',
- 'Urban design'] }
-
- SPECIALISTS[:richard_james] = { :display_name => 'Richard James',
- :job_title => 'Nursing Liaison',
- :email => 'rjame@upenn.edu',
- :phone => '215-746-4034',
- :office => 'Biomedical Library',
- :portrait => 'richard_james.jpg',
- :subjects => ['Bioethics',
- 'Nursing'] }
-
- SPECIALISTS[:sherry_morgan] = { :display_name => 'Sherry Morgan',
- :job_title => 'Graduate & Clinical Research Liaison',
- :email => 'semorgan@upenn.edu',
- :phone => '215-898-0855',
- :office => 'Biomedical Library',
- :portrait => 'sherry_morgan.jpg',
- :subjects => ['Bioethics',
- 'Nursing'] }
-
- SPECIALISTS[:manuel_de_la_cruz_gutierrez] = { :display_name => 'Manuel de la Cruz Gutierrez, PhD',
- :job_title => 'Research & Knowledge Management Liaison',
- :email => 'dmanuel@pobox.upenn.edu',
- :phone => '215-746-2459',
- :office => 'Biomedical Library',
- :portrait => 'manuel_de_la_cruz_gutierrez.jpg',
- :subjects => ['Bioinformatics',
- 'Biomedical graduate studies'] }
-
- SPECIALISTS[:melanie_cedrone] = { :display_name => 'Melanie Cedrone',
- :job_title => 'Collections Librarian & Biology Liaison',
- :email => 'mcedrone@upenn.edu',
- :phone => '215-898-1862',
- :office => 'Biomedical Library',
- :portrait => 'melanie_cedrone.jpg',
- :subjects => ['Earth & environmental science',
- 'General science',
- 'Biology',
- 'Biomedical research',
- 'Medicine'] }
-
- SPECIALISTS[:judith_currano] = { :display_name => 'Judith Currano',
- :job_title => 'Head, Chemistry Library',
- :email => 'currano@pobox.upenn.edu',
- :phone => '215-746-5886 and 215-898-2177',
- :office => 'Chemistry Laboratories, 1973 Wing',
- :portrait => 'judith_currano.jpg',
- :subjects => ['Chemistry'] }
-
- SPECIALISTS[:brian_vivier] = { :display_name => 'Brian Vivier',
- :job_title => 'Chinese Studies Librarian & Coordinator for Area Studies Collections',
- :email => 'vivier@pobox.upenn.edu',
- :phone => '215-898-3412',
- :office => '525 Van Pelt-Dietrich Library Center',
- :portrait => 'brian_vivier.jpg',
- :subjects => ['Chinese studies',
- 'East Asian studies'] }
-
- SPECIALISTS[:charles_cobine] = { :display_name => 'Charles Cobine',
- :job_title => 'Digital Outreach Librarian',
- :email => 'cobine@upenn.edu',
- :phone => '215-746-5830',
- :office => '131-11 Van Pelt-Dietrich Library Center',
- :portrait => 'charles_cobine.jpg',
- :subjects => ['Cinema & media studies',
- 'Germanic languages & literatures',
- 'Organizational dynamics'] }
-
- SPECIALISTS[:rebecca_stuhr] = { :display_name => 'Rebecca Stuhr',
- :job_title => 'Director, Liaison Services',
- :email => 'stuhrreb@pobox.upenn.edu',
- :phone => '215-898-5999',
- :office => '218 Van Pelt-Dietrich Library Center',
- :portrait => 'rebecca_stuhr.jpg',
- :subjects => ['Russian & East European studies',
- 'Classical studies'] }
-
- SPECIALISTS[:joseph_holub] = { :display_name => 'Joseph Holub',
- :job_title => 'Collection Development & Liaison Services Librarian',
- :email => 'holub@upenn.edu',
- :phone => '215-898-4325',
- :office => '555 Van Pelt-Dietrich Library Center',
- :portrait => 'joseph_holub.jpg',
- :subjects => ['Latin American studies',
- 'Comparative literature',
- 'Italian language & literature',
- 'Latino studies',
- 'Spanish & Portuguese studies',
- 'International relation'] }
-
- SPECIALISTS[:laurel_graham] = { :display_name => 'Laurel Graham',
- :job_title => 'Head, Dental Library',
- :email => 'laurelg@upenn.edu',
- :phone => '215-898-8978',
- :office => '3rd floor, Evans Building',
- :portrait => 'laurel_graham.jpg',
- :subjects => ['Dental medicine'] }
-
- SPECIALISTS[:patty_lynn] = { :display_name => 'Patty Lynn',
- :job_title => 'Librarian for the Graduate School of Education & Education Bibliographer',
- :email => 'lynn@upenn.edu',
- :phone => '215-898-1230',
- :office => '211 Van Pelt Library, 2nd floor east side facing Walnut',
- :portrait => 'patty_lynn.jpg',
- :subjects => ['Education'] }
-
- SPECIALISTS[:amanpreet_kaur] = { :display_name => 'Amanpreet (Aman) Kaur',
- :job_title => 'STEM Librarian',
- :email => 'amankaur@upenn.edu',
- :phone => '215-746-0101',
- :office => 'G-21 Biomedical Library',
- :portrait => 'amanpreet_kaur.jpg',
- :subjects => ['Engineering & computer science'] }
-
- SPECIALISTS[:douglas_mcgee] = { :display_name => 'Douglas McGee',
- :job_title => 'Assistant Director, Science, Technology, Engineering & Math Libraries & Engineering Librarian',
- :email => 'dmcgee@upenn.edu',
- :phone => '215-898-8170',
- :office => 'Biomedical Library',
- :portrait => 'douglas_mcgee.jpg',
- :subjects => ['Engineering & computer science'] }
-
- SPECIALISTS[:marcella_barnhart] = { :display_name => 'Marcella Barnhart',
- :job_title => 'Director, Lippincott Library',
- :email => 'bmarcell@wharton.upenn.edu',
- :phone => '215-898-8755',
- :office => '256.2 Van Pelt-Dietrich Library Center',
- :portrait => 'marcella_barnhart.jpg',
- :subjects => ['Business',
- 'Finance',
- 'Health care management',
- 'Management'] }
-
- SPECIALISTS[:david_azzolina] = { :display_name => 'David Azzolina',
- :job_title => 'Collection Development and Liaison Services Librarian',
- :email => 'azzolina@upenn.edu',
- :phone => '215-898-5322',
- :office => '208 Van Pelt-Dietrich Library Center',
- :portrait => 'david_azzolina.jpg',
- :subjects => ['Folklore & folklife',
- 'History & sociology of science',
- 'Religious studies',
- 'Gender, sexuality, & women\'s studies',
- 'Political science'] }
-
- SPECIALISTS[:vickie_karasic] = { :display_name => 'Vickie Karasic',
- :job_title => 'Managing Librarian for the Weigle Information Commons',
- :email => 'vkarasic@pobox.upenn.edu',
- :phone => '215-746-2520',
- :office => '125 Van Pelt-Dietrich Library Center',
- :portrait => 'vickie_karasic.jpg',
- :subjects => ['French language & literature'] }
-
- SPECIALISTS[:girmaye_misgna] = { :display_name => 'Girmaye Misgna',
- :job_title => 'Mapping & Geospatial Data Librarian',
- :email => 'gmisgna@upenn.edu',
- :phone => '',
- :office => '131-17 Van Pelt-Dietrich Library Center',
- :portrait => 'girmaye_misgna.jpg',
- :subjects => ['Geographic information systems'] }
-
- SPECIALISTS[:cynthia_cronin_kardon] = { :display_name => 'Cynthia Cronin-Kardon',
- :job_title => 'Business Reference & Resource Development Librarian',
- :email => 'croninkc@wharton.upenn.edu',
- :phone => '215-898-5927',
- :office => '243.4 Van Pelt-Dietrich Library Center',
- :portrait => 'cynthia_cronin_kardon.jpg',
- :subjects => ['Business',
- 'International business',
- 'Real estate'] }
-
- SPECIALISTS[:molly_des_jardin] = { :display_name => 'Molly Des Jardin',
- :job_title => 'Japanese Studies Librarian',
- :email => 'mollydes@upenn.edu',
- :phone => '215-898-3205',
- :office => '527 Van Pelt-Dietrich Library Center',
- :portrait => 'molly_des_jardin.jpg',
- :subjects => ['Japanese studies',
- 'Korean studies'] }
-
- SPECIALISTS[:arthur_kiron] = { :display_name => 'Arthur Kiron',
- :job_title => 'Schottenstein-Jesselson Curator of Judaica Collections',
- :email => 'kiron@pobox.upenn.edu',
- :phone => '215-573-7431',
- :office => '205 Van Pelt-Dietrich Library Center',
- :portrait => 'arthur_kiron.jpg',
- :subjects => ['Judaic studies',
- 'Judaica special collections',
- 'Judaica collections'] }
-
- SPECIALISTS[:bruce_nielsen] = { :display_name => 'Bruce Nielsen',
- :job_title => 'Judaica Public Services Librarian & Archivist',
- :email => 'bnielsen@pobox.upenn.edu',
- :phone => '215-746-1290',
- :office => '203 Library at the Katz Center for Advanced Judaic Studies',
- :portrait => 'bruce_nielsen.jpg',
- :subjects => ['Judaic studies',
- 'Judaica special collections'] }
-
- SPECIALISTS[:mia_wells] = { :display_name => 'Mia Wells',
- :email => 'kirstien@wharton.upenn.edu',
- :job_title => 'Business Research & Document Delivery Librarian',
- :phone => '215-898-5553',
- :office => '243.1 Van Pelt-Dietrich Library Center',
- :portrait => 'mia_wells.jpg',
- :subjects => ['Legal studies & business ethics' ,
- 'Marketing',
- 'Operations, information, & decisions'] }
-
- SPECIALISTS[:samantha_kirk] = { :display_name => 'Samantha Kirk',
- :job_title => 'Information Literacy Librarian',
- :email => 'samkirk@upenn.edu',
- :phone => '215-898-0316',
- :office => '131-7 Van Pelt-Dietrich Library Center',
- :portrait => 'samantha_kirk.jpg',
- :subjects => ['Literature in English',
- 'Theatre arts'] }
-
- SPECIALISTS[:mitch_fraas] = { :display_name => 'Arthur Mitchell Fraas',
- :job_title => 'Curator, Special Collections',
- :email => 'fraas@pobox.upenn.edu',
- :phone => '215-898-0605',
- :office => '608 Van Pelt-Dietrich Library Center',
- :portrait => 'mitch_fraas.jpg',
- :subjects => ['Manuscript studies',
- 'Modern manuscripts & archives',
- 'Rare books & printed materials',
- 'Special collections - manuscripts',
- 'Special collections - printed books'] }
-
- SPECIALISTS[:nicholas_herman] = { :display_name => 'Nicholas Herman',
- :job_title => 'Curator, SIMS Manuscripts',
- :email => 'hermanni@upenn.edu',
- :phone => '215-898-7266',
- :office => '608 Van Pelt-Dietrich Library Center',
- :portrait => 'nicholas_herman.jpg',
- :subjects => ['Manuscript studies',
- 'Medieval studies'] }
-
- SPECIALISTS[:dot_porter] = { :display_name => 'Dot Porter',
- :job_title => 'Curator of Digital Research Services',
- :email => 'dorp@upenn.edu',
- :phone => '215-898-9742',
- :office => '613 Van Pelt-Dietrich Library Center',
- :portrait => 'dot_porter.jpg',
- :subjects => ['Manuscript studies',
- 'Medieval manuscripts'] }
-
- SPECIALISTS[:lynn_ransom] = { :display_name => 'Lynn Ransom',
- :job_title => 'Curator, SIMS Programs',
- :email => 'lransom@pobox.upenn.edu',
- :phone => '215-898-7851',
- :office => '611 Van Pelt-Dietrich Library Center',
- :portrait => 'lynn_ransom.jpg',
- :subjects => ['Manuscript studies',
- 'Medieval manuscripts'] }
-
- SPECIALISTS[:lauren_gala] = { :display_name => 'Lauren Gala',
- :job_title => 'Science and Digital Initiatives Librarian & Head, Mathematics/Physics/Astronomy Library',
- :email => 'milaur@upenn.edu',
- :phone => '215-746-0228',
- :office => 'Math/Physics/Astronomy Library',
- :portrait => 'lauren_gala.jpg',
- :subjects => ['Mathematics',
- 'Physics & astronomy'] }
-
- SPECIALISTS[:frank_campbell] = { :display_name => 'Frank Campbell',
- :job_title => 'Medical Education Liaison Librarian',
- :email => 'campbell@upenn.edu',
- :phone => '215-898-9905',
- :office => 'Johnson Pavilion',
- :portrait => 'frank_campbell.jpg',
- :subjects => ['Medicine'] }
-
- SPECIALISTS[:maylene_qiu] = { :display_name => 'Maylene Qiu',
- :job_title => 'Systematic Review Coordinator and Clinical Liaison Librarian',
- :email => '',
- :phone => '215-573-3184',
- :office => 'Biomedical Library',
- :portrait => 'maylene_qiu.jpg',
- :subjects => ['Medicine'] }
-
- SPECIALISTS[:carlos_rodriguez] = { :display_name => 'Carlos Rodriguez',
- :job_title => 'Head, Patron Services (Biomedical Library)',
- :email => 'rodrigue@pobox.upenn.edu',
- :phone => '215-898-9610',
- :office => 'Johnson Pavilion',
- :portrait => 'carlos_rodriguez.jpg',
- :subjects => ['Medicine'] }
-
- SPECIALISTS[:william_noel] = { :display_name => 'William Noel',
- :job_title => 'Associate University Librarian & Director, Kislak Center for Special Collections, Rare Books and Manuscripts & Director, Schoenberg Institute for Manuscript Studies',
- :email => 'wgnoel@upenn.edu',
- :phone => '215-898-9767',
- :office => '609 Van Pelt-Dietrich Library Center',
- :portrait => 'william_noel.jpg',
- :subjects => ['Medieval manuscripts'] }
-
- SPECIALISTS[:gwen_collaco] = { :display_name => 'Gwen Collaço',
- :job_title => 'Middle Eastern Studies Librarian',
- :email => 'gcollaco@upenn.edu',
- :phone => '215-898-7769',
- :office => '524 Van Pelt-Dietrich Library Center',
- :portrait => 'gwen_collaco.jpg',
- :subjects => ['Middle Eastern studies'] }
-
- SPECIALISTS[:lynne_farrington] = { :display_name => 'Lynne Farrington',
- :job_title => 'Senior Curator, Special Collections',
- :email => 'lynne@upenn.edu',
- :phone => '215-746-5828',
- :office => '614 Van Pelt-Dietrich Library Center',
- :portrait => 'lynne_farrington.jpg',
- :subjects => ['Modern manuscripts & archives',
- 'Rare books & printed materials',
- 'Special collections - manuscripts',
- 'Special collections - printed books'] }
-
- SPECIALISTS[:david_mcknight] = { :display_name => 'David McKnight',
- :job_title => 'Director, Rare Book & Manuscript Library',
- :email => 'dmcknigh@pobox.upenn.edu',
- :phone => '215-746-5829',
- :office => '615 Van Pelt-Dietrich Library Center',
- :portrait => 'david_mcknight.jpg',
- :subjects => ['Modern manuscripts & archives',
- 'Rare books & printed materials'] }
-
- SPECIALISTS[:liza_vick] = { :display_name => 'Liza Vick',
- :job_title => 'Head, Otto E. Albrecht Music Library & Eugene Ormandy Music & Media Center',
- :email => 'lizavick@upenn.edu',
- :phone => '215-898-3450',
- :office => '452.2 Van Pelt-Dietrich Library Center',
- :portrait => 'liza_vick.jpg',
- :subjects => ['Music'] }
-
- SPECIALISTS[:anne_larrivee] = { :display_name => 'Anne Larrivee',
- :job_title => 'Social Science Librarian',
- :email => 'larrivee@upenn.edu',
- :phone => '215-746-0384',
- :office => '219 Van Pelt-Dietrich Library Center',
- :portrait => 'anne_larrivee.jpg',
- :subjects => ['Nonprofit leadership',
- 'Psychology',
- 'Social policy',
- 'Social work'] }
-
- SPECIALISTS[:margaret_janz] = { :display_name => 'Margaret Janz',
- :job_title => 'Scholarly Communications and Data Curation Librarian',
- :email => 'mjanz@upenn.edu',
- :phone => '215-898-4836',
- :office => '131-4 Van Pelt-Dietrich Library Center',
- :portrait => 'margaret_janz.jpg',
- :subjects => ['Scholarly publishing'] }
-
- SPECIALISTS[:kenny_whitebloom] = { :display_name => 'Kenny Whitebloom',
- :job_title => 'Digital Scholarly Publishing Librarian',
- :email => 'kenwhi@upenn.edu',
- :phone => '215-573-4207',
- :office => '131-3 Van Pelt-Dietrich Library Center',
- :portrait => 'kenny_whitebloom.jpg',
- :subjects => ['Scholarly publishing'] }
-
- SPECIALISTS[:sarah_wipperman] = { :display_name => 'Sarah Wipperman',
- :job_title => 'Scholarly Communications & Digital Repository Librarian',
- :email => 'swipp@upenn.edu',
- :phone => '215-746-7331',
- :office => '131-9 Van Pelt-Dietrich Library Center',
- :portrait => 'sarah_wipperman.jpg',
- :subjects => ['Scholarly publishing'] }
-
- SPECIALISTS[:jef_pierce] = { :display_name => 'Jef Pierce',
- :job_title => 'South Asian Studies Librarian',
- :email => 'jfpierce@upenn.edu',
- :phone => '215-898-7146',
- :office => '555 Van Pelt-Dietrich Library Center',
- :portrait => 'jef_pierce.jpg',
- :subjects => ['South Asian Studies'] }
-
- SPECIALISTS[:dee_crandall] = { :display_name => 'Dee Crandall',
- :job_title => 'Assistant Veterinary Librarian',
- :email => 'dcrand@pobox.upenn.edu',
- :phone => '610-925-6235',
- :office => 'Jean Austin duPont Veterinary Medicine Library',
- :portrait => 'dee_crandall.jpg',
- :subjects => ['Veterinary medicine'] }
-
- SPECIALISTS[:margy_lindem] = { :display_name => 'Margy Lindem',
- :job_title => 'Head, Veterinary Libraries',
- :email => 'mlindem@upenn.edu',
- :phone => '215-898-8874',
- :office => 'Steven W. Atwood Veterinary Medicine Library',
- :portrait => 'margy_lindem.jpg',
- :subjects => ['Veterinary medicine'] }
-
- SUBJECTS[:accounting] = [SPECIALISTS[:cathy_ogur]]
-
- SUBJECTS[:african] = [SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:africana] = [SPECIALISTS[:nick_okrent]]
-
- SUBJECTS[:anthropology] = [SPECIALISTS[:deborah_stewart]]
-
- SUBJECTS[:archaeology] = [SPECIALISTS[:deborah_stewart]]
-
- SUBJECTS[:architectural_history] = [SPECIALISTS[:hannah_bennett],
- SPECIALISTS[:patricia_guardiola]]
-
- SUBJECTS[:architecture_city_planning] = [SPECIALISTS[:hannah_bennett],
- SPECIALISTS[:patricia_guardiola]]
-
- SUBJECTS[:art_history] = [SPECIALISTS[:hannah_bennett],
- SPECIALISTS[:patricia_guardiola]]
-
- SUBJECTS[:asian_american] = [SPECIALISTS[:nick_okrent]]
-
- SUBJECTS[:bioethics] = [SPECIALISTS[:richard_james],
- SPECIALISTS[:sherry_morgan]]
-
- SUBJECTS[:bioinformatics] = [SPECIALISTS[:manuel_de_la_cruz_gutierrez]]
-
- SUBJECTS[:biology] = [SPECIALISTS[:melanie_cedrone]]
-
- SUBJECTS[:biomedical_grad] = [SPECIALISTS[:manuel_de_la_cruz_gutierrez]]
-
- SUBJECTS[:biomedical_research] = [SPECIALISTS[:melanie_cedrone]]
-
- SUBJECTS[:business_economics_policy] = [SPECIALISTS[:cathy_ogur]]
-
- SUBJECTS[:chemistry] = [SPECIALISTS[:judith_currano]]
-
- SUBJECTS[:chinese] = [SPECIALISTS[:brian_vivier]]
-
- SUBJECTS[:cinema_media] = [SPECIALISTS[:charles_cobine]]
-
- SUBJECTS[:classics] = [SPECIALISTS[:rebecca_stuhr]]
-
- SUBJECTS[:communication] = [SPECIALISTS[:sharon_black],
- SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:comparative_literature] = [SPECIALISTS[:joseph_holub]]
-
- SUBJECTS[:criminology] = [SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:dental] = [SPECIALISTS[:laurel_graham]]
-
- SUBJECTS[:earth_environmental_science] = [SPECIALISTS[:melanie_cedrone]]
-
- SUBJECTS[:economics] = [SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:education] = [SPECIALISTS[:patty_lynn]]
-
- SUBJECTS[:engineering_and_cs] = [SPECIALISTS[:amanpreet_kaur],
- SPECIALISTS[:douglas_mcgee]]
-
- SUBJECTS[:entrepreneurship] = [SPECIALISTS[:cathy_ogur]]
-
- SUBJECTS[:finance] = [SPECIALISTS[:marcella_barnhart]]
-
- SUBJECTS[:fine_arts] = [SPECIALISTS[:hannah_bennett],
- SPECIALISTS[:patricia_guardiola]]
-
- SUBJECTS[:folk] = [SPECIALISTS[:david_azzolina]]
-
- SUBJECTS[:french] = [SPECIALISTS[:vickie_karasic]]
-
- SUBJECTS[:gender] = [SPECIALISTS[:david_azzolina]]
-
- SUBJECTS[:science] = [SPECIALISTS[:melanie_cedrone]]
-
- SUBJECTS[:gis] = [SPECIALISTS[:girmaye_misgna], SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:germanic] = [SPECIALISTS[:charles_cobine]]
-
- SUBJECTS[:health_care_management] = [SPECIALISTS[:marcella_barnhart]]
-
- SUBJECTS[:historic_preservation] = [SPECIALISTS[:hannah_bennett],
- SPECIALISTS[:patricia_guardiola]]
-
- SUBJECTS[:history] = [SPECIALISTS[:nick_okrent]]
-
- SUBJECTS[:history_sociology_of_science] = [SPECIALISTS[:david_azzolina]]
-
- SUBJECTS[:humanities] = [SPECIALISTS[:nick_okrent]]
-
- SUBJECTS[:international_business] = [SPECIALISTS[:cynthia_cronin_kardon]]
-
- SUBJECTS[:international_relations] = [SPECIALISTS[:joseph_holub]]
-
- SUBJECTS[:italian] = [SPECIALISTS[:joseph_holub]]
-
- SUBJECTS[:japanese] = [SPECIALISTS[:molly_des_jardin]]
-
- SUBJECTS[:judaica_special_collections] = [SPECIALISTS[:arthur_kiron]]
-
- SUBJECTS[:judaic] = [SPECIALISTS[:bruce_nielsen],
- SPECIALISTS[:arthur_kiron]]
-
- SUBJECTS[:korean] = [SPECIALISTS[:molly_des_jardin]]
-
- SUBJECTS[:lanscape_architecture] = [SPECIALISTS[:hannah_bennett],
- SPECIALISTS[:patricia_guardiola]]
-
- SUBJECTS[:latin_america] = [SPECIALISTS[:joseph_holub]]
-
- SUBJECTS[:latino] = [SPECIALISTS[:joseph_holub]]
-
- SUBJECTS[:legal_business_ethics] = [SPECIALISTS[:mia_wells]]
-
- SUBJECTS[:linguistics] = [SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:literature_in_english] = [SPECIALISTS[:samantha_kirk]]
-
- SUBJECTS[:management] = [SPECIALISTS[:marcella_barnhart]]
-
- SUBJECTS[:manuscripts] = [SPECIALISTS[:mitch_fraas],
- SPECIALISTS[:nicholas_herman],
- SPECIALISTS[:dot_porter],
- SPECIALISTS[:lynn_ransom]]
-
- SUBJECTS[:marketing] = [SPECIALISTS[:mia_wells]]
-
- SUBJECTS[:math] = [SPECIALISTS[:lauren_gala]]
-
- SUBJECTS[:medicine] = [SPECIALISTS[:frank_campbell],
- SPECIALISTS[:melanie_cedrone],
- SPECIALISTS[:maylene_qiu],
- SPECIALISTS[:carlos_rodriguez]]
-
- SUBJECTS[:medieval_manuscripts] = [SPECIALISTS[:william_noel],
- SPECIALISTS[:dot_porter],
- SPECIALISTS[:lynn_ransom]]
-
- SUBJECTS[:medieval_studies] = [SPECIALISTS[:nicholas_herman]]
-
- SUBJECTS[:middle_east] = [SPECIALISTS[:gwen_collaco]]
-
- SUBJECTS[:modern_manuscripts_archives] = [SPECIALISTS[:lynne_farrington],
- SPECIALISTS[:mitch_fraas],
- SPECIALISTS[:david_mcknight]]
-
- SUBJECTS[:music] = [SPECIALISTS[:liza_vick]]
-
- SUBJECTS[:nonprofit_leadership] = [SPECIALISTS[:anne_larrivee]]
-
- SUBJECTS[:nursing] = [SPECIALISTS[:richard_james],
- SPECIALISTS[:sherry_morgan]]
-
- SUBJECTS[:operations_decisions] = [SPECIALISTS[:mia_wells]]
-
- SUBJECTS[:organizational_dynamics] = [SPECIALISTS[:charles_cobine]]
-
- SUBJECTS[:philosophy] = [SPECIALISTS[:nick_okrent]]
-
- SUBJECTS[:philosophy_politics_economics] = [SPECIALISTS[:nick_okrent]]
-
- SUBJECTS[:physics_astronomy] = [SPECIALISTS[:lauren_gala]]
-
- SUBJECTS[:political_science] = [SPECIALISTS[:david_azzolina],
- SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:political_science_data] = [SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:psychology] = [SPECIALISTS[:anne_larrivee]]
-
- SUBJECTS[:rare_books] = [SPECIALISTS[:lynne_farrington],
- SPECIALISTS[:mitch_fraas],
- SPECIALISTS[:david_mcknight]]
-
- SUBJECTS[:real_estate] = [SPECIALISTS[:cynthia_cronin_kardon]]
-
- SUBJECTS[:regional_science] = [SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:religious_studies] = [SPECIALISTS[:david_azzolina]]
-
- SUBJECTS[:romance_languages] = [SPECIALISTS[:joseph_holub]]
-
- SUBJECTS[:scholarly_publishing] = [SPECIALISTS[:margaret_janz],
- SPECIALISTS[:kenny_whitebloom],
- SPECIALISTS[:sarah_wipperman]]
-
- SUBJECTS[:social_impact] = [SPECIALISTS[:cathy_ogur]]
-
- SUBJECTS[:social_policy] = [SPECIALISTS[:social_policy]]
-
- SUBJECTS[:social_science_data] = [SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:social_work] = [SPECIALISTS[:anne_larrivee]]
-
- SUBJECTS[:sociology] = [SPECIALISTS[:lauris_olson]]
-
- SUBJECTS[:south_asian] = [SPECIALISTS[:jef_pierce]]
-
- SUBJECTS[:spanish_portuguese] = [SPECIALISTS[:joseph_holub]]
-
- SUBJECTS[:theater] = [SPECIALISTS[:samantha_kirk]]
-
- SUBJECTS[:veterinary] = [SPECIALISTS[:dee_crandall],
- SPECIALISTS[:margy_lindem]]
-
- end
-
-end
-
diff --git a/lib/penn_lib/marc.rb b/lib/penn_lib/marc.rb
index 097ca5fa..404e9116 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)
@@ -496,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
@@ -503,7 +507,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}))
@@ -522,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.
@@ -552,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
@@ -709,12 +715,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')
@@ -833,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]
@@ -876,7 +874,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|
@@ -890,6 +888,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)
@@ -1674,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
@@ -2374,7 +2376,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",
diff --git a/lib/penn_lib/subject_specialists.rb b/lib/penn_lib/subject_specialists.rb
new file mode 100644
index 00000000..ccf56017
--- /dev/null
+++ b/lib/penn_lib/subject_specialists.rb
@@ -0,0 +1,103 @@
+module PennLib
+ # methods to facilitate retrieval of subject specialist data from PennLib
+ # Drupal site
+ module SubjectSpecialists
+ DRUPAL_SPECIALISTS_URL =
+ 'https://www.library.upenn.edu/rest/views/subject-specialists?_format=json'.freeze
+ CACHE_KEY = :subject_specialist_data
+
+ class << self
+ # Returns specialist info hash, and sets the cached value if needed,
+ # returning nil if neither the cached date nor the live data passes
+ # the seems_legit? test
+ # @return [Hash, nil]
+ def data
+ cached_data = Rails.cache.read CACHE_KEY
+ return cached_data if seems_legit? cached_data
+
+ cache_data
+ end
+
+ # Set specialist data in cache if it passes the seems_legit? test
+ # If it fails, return nil. THe display helper should then render the view
+ # that doesn't require the specialist info
+ # @return [Hash, nil]
+ def cache_data
+ data = subjects
+ return nil unless seems_legit? data
+
+ Rails.cache.write CACHE_KEY, data, expires_in: 24.hours
+ data
+ end
+
+ # Roughly determine if data is a valid subject_specialists data
+ # structure. This ain't pretty but it is what it is.
+ # @param [Hash] data
+ # @return [TrueClass, FalseClass]
+ def seems_legit?(data)
+ # ensure we aren't dealing with a blank value
+ return false if data.blank?
+
+ # ensure first array element is also an array
+ return false unless data.first.is_a? Array
+
+ # ensure the second element of the first array element is also an
+ # array
+ return false unless data.first.second&.is_a? Array
+
+ # ensure the place where we expect the actual hash of data has one of
+ # the keys we expect
+ return false unless data.first.second.first&.key? 'subject_specialty'
+
+ true
+ end
+
+ # return hash of subjects for use in display of subject specialist info
+ # @return [Hash]
+ def subjects
+ specialists = ActiveSupport::HashWithIndifferentAccess.new
+ subjects = ActiveSupport::HashWithIndifferentAccess.new
+ live_specialists_data = retrieve_specialist_json
+ return unless live_specialists_data
+
+ live_specialists_data.each do |specialty|
+ # nasty way to make the subject hash key match Drupal anchor tag ids
+ subject_key = specialty['subject_specialty'].gsub(/[&#;]/, '')
+ .parameterize.underscore
+ specialty = specialty.transform_values { |v| CGI.unescapeHTML v }
+ name = specialty['full_name'].parameterize.underscore
+ subjects[subject_key] = [] unless subjects[subject_key]
+ subjects[subject_key] << name
+ if specialists[name]
+ specialists[name][:subjects] << specialty['subject_specialty']
+ else
+ specialty[:subjects] = [specialty['subject_specialty']]
+ specialty[:display_name] = specialty['full_name']
+ specialty[:portrait] =
+ "https://www.library.upenn.edu#{specialty['thumbnail']}"
+ specialists[name] = specialty
+ end
+ end
+ subjects.each do |subject, staff|
+ subjects[subject] = staff.map { |name| specialists[name] }
+ end
+ end
+
+ # Pull and parse data from Drupal endpoint
+ # Will retry up to 2 times and return nil if there are issues parsing JSON
+ # @return [Hash, NilClass]
+ def retrieve_specialist_json
+ connection = Faraday.new do |conn|
+ conn.request :retry, max: 2, interval: 0.1, backoff_factor: 2
+ conn.adapter :net_http
+ end
+ response_body = connection.get(DRUPAL_SPECIALISTS_URL).body
+ JSON.parse(response_body)
+ # handle attempt to parse nil or empty response, as well as connection
+ # errors
+ rescue TypeError, JSON::JSONError, Faraday::ClientError => _e
+ nil
+ end
+ end
+ end
+end
diff --git a/nginx/webapp-env.conf b/nginx/webapp-env.conf
index 3eb941d4..a8043416 100644
--- a/nginx/webapp-env.conf
+++ b/nginx/webapp-env.conf
@@ -10,6 +10,7 @@ env ALMA_INSTITUTION_CODE;
env DATABASE_URL;
env DEVISE_SECRET_KEY;
env ENABLE_DEBUG_URLS;
+env HONEYBADGER_API_KEY;
env RAILS_ENV;
env RAILS_LOG_LEVEL;
env RELAIS_API_KEY;
diff --git a/package-lock.json b/package-lock.json
index 7521c9c3..b7eb4a63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,61 +13,56 @@
}
},
"acorn": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
- "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="
- },
- "acorn-dynamic-import": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
- "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw=="
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="
},
"acorn-node": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.2.tgz",
- "integrity": "sha512-rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg==",
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
+ "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
"requires": {
- "acorn": "^6.0.2",
- "acorn-dynamic-import": "^4.0.0",
- "acorn-walk": "^6.1.0",
- "xtend": "^4.0.1"
+ "acorn": "^7.0.0",
+ "acorn-walk": "^7.0.0",
+ "xtend": "^4.0.2"
+ },
+ "dependencies": {
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+ }
}
},
"acorn-walk": {
- "version": "6.1.1",
- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
- "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw=="
- },
- "array-filter": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
- "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
- },
- "array-map": {
- "version": "0.0.0",
- "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
- "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
- },
- "array-reduce": {
- "version": "0.0.0",
- "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
- "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys="
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+ "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
},
"asn1.js": {
- "version": "4.10.1",
- "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
- "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+ "version": "5.4.1",
+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
"requires": {
"bn.js": "^4.0.0",
"inherits": "^2.0.1",
- "minimalistic-assert": "^1.0.0"
+ "minimalistic-assert": "^1.0.0",
+ "safer-buffer": "^2.1.0"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.11.9",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+ "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+ }
}
},
"assert": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
- "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
"requires": {
+ "object-assign": "^4.1.1",
"util": "0.10.3"
},
"dependencies": {
@@ -97,14 +92,14 @@
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
},
"base64-js": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
- "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+ "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
},
"bn.js": {
- "version": "4.11.8",
- "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
- "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+ "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ=="
},
"brace-expansion": {
"version": "1.1.11",
@@ -134,50 +129,44 @@
}
},
"browser-resolve": {
- "version": "1.11.3",
- "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
- "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz",
+ "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==",
"requires": {
- "resolve": "1.1.7"
- },
- "dependencies": {
- "resolve": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
- "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
- }
+ "resolve": "^1.17.0"
}
},
"browserify": {
- "version": "13.3.0",
- "resolved": "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz",
- "integrity": "sha1-tanJAgJD8McORnW+yCI7xifkFc4=",
+ "version": "16.5.2",
+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz",
+ "integrity": "sha512-TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g==",
"requires": {
"JSONStream": "^1.0.3",
"assert": "^1.4.0",
"browser-pack": "^6.0.1",
- "browser-resolve": "^1.11.0",
- "browserify-zlib": "~0.1.2",
- "buffer": "^4.1.0",
+ "browser-resolve": "^2.0.0",
+ "browserify-zlib": "~0.2.0",
+ "buffer": "~5.2.1",
"cached-path-relative": "^1.0.0",
- "concat-stream": "~1.5.1",
+ "concat-stream": "^1.6.0",
"console-browserify": "^1.1.0",
"constants-browserify": "~1.0.0",
"crypto-browserify": "^3.0.0",
"defined": "^1.0.0",
"deps-sort": "^2.0.0",
- "domain-browser": "~1.1.0",
+ "domain-browser": "^1.2.0",
"duplexer2": "~0.1.2",
- "events": "~1.1.0",
+ "events": "^2.0.0",
"glob": "^7.1.0",
"has": "^1.0.0",
"htmlescape": "^1.1.0",
- "https-browserify": "~0.0.0",
+ "https-browserify": "^1.0.0",
"inherits": "~2.0.1",
"insert-module-globals": "^7.0.0",
"labeled-stream-splicer": "^2.0.0",
- "module-deps": "^4.0.8",
- "os-browserify": "~0.1.1",
+ "mkdirp-classic": "^0.5.2",
+ "module-deps": "^6.2.3",
+ "os-browserify": "~0.3.0",
"parents": "^1.0.1",
"path-browserify": "~0.0.0",
"process": "~0.11.0",
@@ -189,16 +178,16 @@
"shasum": "^1.0.0",
"shell-quote": "^1.6.1",
"stream-browserify": "^2.0.0",
- "stream-http": "^2.0.0",
- "string_decoder": "~0.10.0",
+ "stream-http": "^3.0.0",
+ "string_decoder": "^1.1.1",
"subarg": "^1.0.0",
"syntax-error": "^1.1.1",
"through2": "^2.0.0",
"timers-browserify": "^1.0.1",
- "tty-browserify": "~0.0.0",
+ "tty-browserify": "0.0.1",
"url": "~0.11.0",
"util": "~0.10.1",
- "vm-browserify": "~0.0.1",
+ "vm-browserify": "^1.0.0",
"xtend": "^4.0.0"
}
},
@@ -280,38 +269,68 @@
"requires": {
"bn.js": "^4.1.0",
"randombytes": "^2.0.1"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.11.9",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+ "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+ }
}
},
"browserify-sign": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
- "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
- "requires": {
- "bn.js": "^4.1.1",
- "browserify-rsa": "^4.0.0",
- "create-hash": "^1.1.0",
- "create-hmac": "^1.1.2",
- "elliptic": "^6.0.0",
- "inherits": "^2.0.1",
- "parse-asn1": "^5.0.0"
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+ "requires": {
+ "bn.js": "^5.1.1",
+ "browserify-rsa": "^4.0.1",
+ "create-hash": "^1.2.0",
+ "create-hmac": "^1.1.7",
+ "elliptic": "^6.5.3",
+ "inherits": "^2.0.4",
+ "parse-asn1": "^5.1.5",
+ "readable-stream": "^3.6.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "readable-stream": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+ }
}
},
"browserify-zlib": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
- "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
"requires": {
- "pako": "~0.2.0"
+ "pako": "~1.0.5"
}
},
"buffer": {
- "version": "4.9.1",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
- "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+ "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
"requires": {
"base64-js": "^1.0.2",
- "ieee754": "^1.1.4",
- "isarray": "^1.0.0"
+ "ieee754": "^1.1.4"
}
},
"buffer-from": {
@@ -360,42 +379,20 @@
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"concat-stream": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
- "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
"requires": {
- "inherits": "~2.0.1",
- "readable-stream": "~2.0.0",
- "typedarray": "~0.0.5"
- },
- "dependencies": {
- "process-nextick-args": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
- "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
- },
- "readable-stream": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
- "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
- "requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.1",
- "isarray": "~1.0.0",
- "process-nextick-args": "~1.0.6",
- "string_decoder": "~0.10.x",
- "util-deprecate": "~1.0.1"
- }
- }
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.2.2",
+ "typedarray": "^0.0.6"
}
},
"console-browserify": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
- "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
- "requires": {
- "date-now": "^0.1.4"
- }
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
},
"constants-browserify": {
"version": "1.0.0",
@@ -413,12 +410,19 @@
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
"create-ecdh": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
- "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
"requires": {
"bn.js": "^4.1.0",
- "elliptic": "^6.0.0"
+ "elliptic": "^6.5.3"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.11.9",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+ "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+ }
}
},
"create-hash": {
@@ -469,50 +473,39 @@
"resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
"integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="
},
- "date-now": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
- "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
- },
"defined": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
},
"deps-sort": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
- "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz",
+ "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==",
"requires": {
"JSONStream": "^1.0.3",
- "shasum": "^1.0.0",
+ "shasum-object": "^1.0.0",
"subarg": "^1.0.0",
"through2": "^2.0.0"
}
},
"des.js": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
- "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
"requires": {
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0"
}
},
"detective": {
- "version": "4.7.1",
- "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
- "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
+ "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
"requires": {
- "acorn": "^5.2.1",
- "defined": "^1.0.0"
- },
- "dependencies": {
- "acorn": {
- "version": "5.7.3",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
- "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
- }
+ "acorn-node": "^1.6.1",
+ "defined": "^1.0.0",
+ "minimist": "^1.1.1"
}
},
"diffie-hellman": {
@@ -523,12 +516,19 @@
"bn.js": "^4.1.0",
"miller-rabin": "^4.0.0",
"randombytes": "^2.0.0"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.11.9",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+ "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+ }
}
},
"domain-browser": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
- "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw="
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+ "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
},
"duplexer2": {
"version": "0.1.4",
@@ -539,9 +539,9 @@
}
},
"elliptic": {
- "version": "6.4.1",
- "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
- "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+ "version": "6.5.3",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+ "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
"requires": {
"bn.js": "^4.4.0",
"brorand": "^1.0.1",
@@ -550,12 +550,19 @@
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0",
"minimalistic-crypto-utils": "^1.0.0"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.11.9",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+ "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+ }
}
},
"events": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
- "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
+ "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg=="
},
"evp_bytestokey": {
"version": "1.0.3",
@@ -572,6 +579,11 @@
"login-status": "git+https://github.com/upenn-libraries/login-status.git"
}
},
+ "fast-safe-stringify": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
+ "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="
+ },
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -588,9 +600,9 @@
"integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="
},
"glob": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
- "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -609,12 +621,35 @@
}
},
"hash-base": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
- "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
"requires": {
- "inherits": "^2.0.1",
- "safe-buffer": "^5.0.1"
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.6.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "readable-stream": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+ }
}
},
"hash.js": {
@@ -642,20 +677,15 @@
"integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E="
},
"https-browserify": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
- "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI="
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
},
"ieee754": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
},
- "indexof": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
- "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
- },
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -693,19 +723,6 @@
"through2": "^2.0.0",
"undeclared-identifiers": "^1.1.2",
"xtend": "^4.0.0"
- },
- "dependencies": {
- "concat-stream": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
- "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
- "requires": {
- "buffer-from": "^1.0.0",
- "inherits": "^2.0.3",
- "readable-stream": "^2.2.2",
- "typedarray": "^0.0.6"
- }
- }
}
},
"is-buffer": {
@@ -737,20 +754,12 @@
"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
},
"labeled-stream-splicer": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz",
- "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
+ "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==",
"requires": {
"inherits": "^2.0.1",
- "isarray": "^2.0.4",
"stream-splicer": "^2.0.0"
- },
- "dependencies": {
- "isarray": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz",
- "integrity": "sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="
- }
}
},
"lodash.memoize": {
@@ -779,6 +788,13 @@
"requires": {
"bn.js": "^4.0.0",
"brorand": "^1.0.1"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.11.9",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+ "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+ }
}
},
"minimalistic-assert": {
@@ -800,32 +816,42 @@
}
},
"minimist": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+ },
+ "mkdirp-classic": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
},
"module-deps": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
- "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
+ "version": "6.2.3",
+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz",
+ "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==",
"requires": {
"JSONStream": "^1.0.3",
- "browser-resolve": "^1.7.0",
- "cached-path-relative": "^1.0.0",
- "concat-stream": "~1.5.0",
+ "browser-resolve": "^2.0.0",
+ "cached-path-relative": "^1.0.2",
+ "concat-stream": "~1.6.0",
"defined": "^1.0.0",
- "detective": "^4.0.0",
+ "detective": "^5.2.0",
"duplexer2": "^0.1.2",
"inherits": "^2.0.1",
"parents": "^1.0.0",
"readable-stream": "^2.0.2",
- "resolve": "^1.1.3",
+ "resolve": "^1.4.0",
"stream-combiner2": "^1.1.1",
"subarg": "^1.0.0",
"through2": "^2.0.0",
"xtend": "^4.0.0"
}
},
+ "object-assign": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+ },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -835,14 +861,14 @@
}
},
"os-browserify": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
- "integrity": "sha1-ScoCk+CxlZCl9d4Qx/JlphfY/lQ="
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+ "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
},
"pako": {
- "version": "0.2.9",
- "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
- "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+ "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
},
"parents": {
"version": "1.0.1",
@@ -853,13 +879,12 @@
}
},
"parse-asn1": {
- "version": "5.1.4",
- "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
- "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
"requires": {
- "asn1.js": "^4.0.0",
+ "asn1.js": "^5.2.0",
"browserify-aes": "^1.0.0",
- "create-hash": "^1.1.0",
"evp_bytestokey": "^1.0.0",
"pbkdf2": "^3.0.3",
"safe-buffer": "^5.1.1"
@@ -886,9 +911,9 @@
"integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I="
},
"pbkdf2": {
- "version": "3.0.17",
- "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
- "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
+ "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
"requires": {
"create-hash": "^1.1.2",
"create-hmac": "^1.1.4",
@@ -918,6 +943,13 @@
"parse-asn1": "^5.0.0",
"randombytes": "^2.0.1",
"safe-buffer": "^5.1.2"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.11.9",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+ "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+ }
}
},
"punycode": {
@@ -985,9 +1017,9 @@
}
},
"resolve": {
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
- "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
"requires": {
"path-parse": "^1.0.6"
}
@@ -1006,6 +1038,11 @@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
+ "safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+ },
"sha.js": {
"version": "2.4.11",
"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
@@ -1024,21 +1061,23 @@
"sha.js": "~2.4.4"
}
},
- "shell-quote": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
- "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
+ "shasum-object": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz",
+ "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==",
"requires": {
- "array-filter": "~0.0.0",
- "array-map": "~0.0.0",
- "array-reduce": "~0.0.0",
- "jsonify": "~0.0.0"
+ "fast-safe-stringify": "^2.0.7"
}
},
+ "shell-quote": {
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
+ "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="
+ },
"simple-concat": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz",
- "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY="
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
},
"source-map": {
"version": "0.5.7",
@@ -1064,30 +1103,61 @@
}
},
"stream-http": {
- "version": "2.8.3",
- "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
- "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.1.1.tgz",
+ "integrity": "sha512-S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg==",
"requires": {
"builtin-status-codes": "^3.0.0",
- "inherits": "^2.0.1",
- "readable-stream": "^2.3.6",
- "to-arraybuffer": "^1.0.0",
- "xtend": "^4.0.0"
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.6.0",
+ "xtend": "^4.0.2"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "readable-stream": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ },
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+ }
}
},
"stream-splicer": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz",
- "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz",
+ "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==",
"requires": {
"inherits": "^2.0.1",
"readable-stream": "^2.0.2"
}
},
"string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "requires": {
+ "safe-buffer": "~5.2.0"
+ },
+ "dependencies": {
+ "safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+ }
+ }
},
"subarg": {
"version": "1.0.0",
@@ -1127,11 +1197,6 @@
"process": "~0.11.0"
}
},
- "to-arraybuffer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
- "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
- },
"tty-browserify": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
@@ -1189,12 +1254,9 @@
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
},
"vm-browserify": {
- "version": "0.0.4",
- "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
- "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
- "requires": {
- "indexof": "0.0.1"
- }
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
},
"wrappy": {
"version": "1.0.2",
diff --git a/package.json b/package.json
index eda68e37..69003116 100644
--- a/package.json
+++ b/package.json
@@ -2,8 +2,8 @@
"name": "discovery",
"description": "top-level package file for rails-browserify to use",
"dependencies": {
- "browserify": "13.3.0",
- "browserify-incremental": "3.1.1",
+ "browserify": "~16.5.2",
+ "browserify-incremental": "~3.1.1",
"ezproxy-login-status": "./jslib/ezproxy-login-status"
},
"license": "MIT",