DACCESS Sprint 2 - Merge dev to main

blacklight-cornell/app/assets/javascripts/aeon/request.js

@@ -34,16 +34,19 @@ function buildRequestForItem(_, element, multipleFlag) {
       location = '',
       callnumber = '',
       copy = '',
+      loc_code = '',
     } = itemdata[req] ?? {};
 
+    // DACCESS-512 combine location fields but make sure they are unique, do not use code field it contains 'rmc' on kheel items 
+
     const fields = [
       { name: `ItemVolume`, value: `${enumeration} ${chron}` },
-      { name: `Location`, value: cslocation + ' ' + location},
+      { name: `Location`, value: cleanLocation(cslocation + ' ' + location + ' ' + loc_code) },
       { name: `CallNumber`, value: callnumber },
       { name: `ItemInfo1`, value: chron },
       { name: `ItemNumber`, value: barcode },
       { name: `ItemIssue`, value: copy },
-      { name: `Site`, value: (cslocation + ' ' + location).toLowerCase().includes('rmc') ? 'RMC' : 'KHEEL' },
+      { name: `Site`, value: /kheel|ilr/i.test(cslocation + ' ' + location + ' ' + loc_code) ? 'KHEEL' : 'RMC' },
     ];
     $("#RequestForm").append(`<input type="hidden" class="dynamic-input" name="Request" value="${req}">`);
     const ext = multipleFlag ? `_${req}` : '';
@@ -81,6 +84,25 @@ function doSubmit(_) {
   return true;
 }
 
+/**
+ * Cleans the location fields for all items by removing duplicate words
+ * may have duplicates due to the variety of ways location is stored for different items
+ * @param  {string} location - original string cslocation + ' ' + location + ' ' + loc_code 
+ * @returns {string} - cleaned location string
+ */
+function cleanLocation(location) {
+  const parts = location.split(' ');
+  const newLocation = [...new Set(parts)];
+  newLocationstr = newLocation.join(' ');
+
+  // if "Rare and Manuscript Collections" is a location, then ensure 'rmc' is included so routing rules work
+  // necessary for: 'sasa,rare' 'hote,rare' 'was,rare' 'ech,rare' etc.
+  if (newLocationstr.includes("Rare and Manuscript Collections") && !newLocationstr.includes('rmc')) {
+    newLocationstr += ' rmc';
+  }
+  return newLocationstr;
+}
+
 /**
  * Handles the click event on a checkbox.
  * Moves the item to the selected items box when a checkbox is checked or unchecked.

blacklight-cornell/app/assets/stylesheets/cornell/_availability.scss

@@ -27,6 +27,12 @@
 		.fa {
 			margin-right: .25rem;
 		}
+		a {
+			display: inline;
+		}
+		.url_findingaid_link {
+			margin-bottom: .5rem;
+		}
 	}
 	.list-unstyled {
 		padding: 0;

blacklight-cornell/app/assets/stylesheets/cornell/_facets.scss

@@ -1,7 +1,6 @@
 .facets {
 	background: white;
 	ul {
-		margin: 0 0 5px 10px;
 		padding: 0;
 		list-style: none;
 	}
@@ -111,9 +110,18 @@
 // ------------------------------------
 
 // Indent child lists - default has no indentation
-#facets ul.facet-hierarchy ul {
-	padding-left: 1.2rem;
-	margin-bottom: .3rem;
+#facets ul.facet-hierarchy  {
+	ul {
+		padding-left: 1.2rem;
+		margin-bottom: .3rem;
+	}
+	.h-leaf {
+		padding-left: 1.4rem;
+	}
+}
+
+.facet-hierarchy .twiddle > .toggle-handle .toggle-icon {
+	margin-top: 0;
 }
 
 // PUBLICATION YEAR

blacklight-cornell/app/controllers/aeon_controller.rb

@@ -23,12 +23,13 @@ def scan_aeon
   end
 
   def set_variables
-    @finding_aid = params[:finding] || ''
+    # @finding_aid = params[:finding] || ''
     @bibid = params[:id]
     _, @document = search_service.fetch(params[:id])
     @title = @document['fulltitle_display']
     @author = @document['author_display']
     @re506 = @document['restrictions_display']&.first&.delete_suffix("'") || ''
+    @finding_aids = @document['url_findingaid_display']
     @disclaimer = 'Once your order is reviewed by our staff you will then be sent an invoice. ' \
     'Your invoice will include information on how to pay for your order. You must pre-pay; ' \
     'staff cannot fulfill your request until you pay the charges.'

blacklight-cornell/app/controllers/browse_controller.rb

@@ -199,12 +199,13 @@ def info
     }
     query_params[:fq] = "headingTypeDesc:\"#{params[:headingtype]}\"" if params[:headingtype].present?
     solr_response = solr.get 'browse', :params => query_params
-    @heading_document = solr_response['response']['docs'][0]
+    solr_doc = solr_response['response']['docs'][0]
+    @heading_document = solr_doc.present? ? HeadingSolrDocument.new(solr_doc) : nil
 
     params[:authq].gsub!('%20', ' ')
 
     # Get Library of Congress local name and format facet for Author and Subject heading
-    if @heading_document.present? && ['Author', 'Subject'].include?(params[:browse_type])
+    if @heading_document.present?
       if params[:browse_type] == 'Author'
         loc_url = get_author_loc_url
       elsif params[:browse_type] == 'Subject'
@@ -214,9 +215,9 @@ def info
       end
 
       @loc_localname = !loc_url.blank? ? loc_url.split('/').last.inspect : ''
-      @formats = get_formats(params[:authq], params[:headingtype])
+      @formats = get_formats(params[:authq])
     else
-      @formats = []
+      @formats = {}
     end
 
     respond_to do |format|
@@ -283,119 +284,23 @@ def get_subject_loc_url
     ''
   end
 
- def get_formats(query,htype)
-    qparam_hash = define_search_fields(query,htype)
-    if qparam_hash.empty?
-      formats = []
+ def get_formats(query)
+    browse_fields = @heading_document.browse_fields
+    if browse_fields.empty?
+      {}
     else
-      solr = RSolr.connect :url => ENV["SOLR_URL"]
-      solr_response = solr.get 'select', :params => {
-                                         :q => qparam_hash[:q],
-                                         :rows => 0,
-                                         :q_row => qparam_hash[:qr],
-                                         :op_row => qparam_hash[:or],
-                                         :search_field_row => qparam_hash[:sfr],
-                                         :mm => 1
-                                        }
+      query = browse_fields.map { |field| "#{field}:\"#{query}\"" }.join(' OR ')
+      solr = RSolr.connect :url => ENV['SOLR_URL']
+      solr_response = solr.get 'select',
+        :params => {
+          :q => query,
+          :rows => 0,
+          :mm => 1
+        }
 
-      formats = solr_response['facet_counts']['facet_fields']['format']
+      format_facet_counts = solr_response['facet_counts']['facet_fields']['format']
+      Hash[*format_facet_counts]
     end
-
-    # uri = "https://digital.library.cornell.edu/catalog.json?utf8=%E2%9C%93&q=#{query}&search_field=all_fields&rows=3"
-    # url = Addressable::URI.parse(URI.escape(uri))
-    # url.normalize
-    # portal_response = JSON.load(open(url.to_s))
-    # if portal_response['response']['pages']['total_count'] > 0
-    #   formats << "Digital Collections"
-    #   formats << portal_response['response']['pages']['total_count']
-    # end
-    f_count = 0
-    tmp_array = []
-    formats.each do |f|
-      if f.class == String
-        tmp_string = pluralize_format(f) + " (" + number_with_delimiter(formats[f_count + 1], :delimiter => ',').to_s + ")"
-        tmp_array << tmp_string
-      end
-      f_count = f_count + 1
-    end
-
-    return tmp_array.sort
-  end
-
-  def pluralize_format(format)
-    case format
-    when "Book"
-      format = "Books"
-    when "Journal/Periodical"
-      format = "Journals/Periodicals"
-    when "Manuscript/Archive"
-      format = "Manuscripts/Archives"
-    when "Map"
-      format = "Maps"
-    when "Musical Score"
-      format = "Musical Scores"
-    when "Non-musical Recording"
-      format = "Non-musical Recordings"
-    when "Video"
-      format = "Videos"
-    when "Computer File"
-      format = "Computer Files"
-    when "Database"
-      format = "Databases"
-    when "Musical Recording"
-      format = "Musical Recordings"
-    when "Thesis"
-      format = "Theses"
-    when "Microform"
-      format = "Microforms"
-    end
-    return format
-  end
-
-  def define_search_fields(query,htype)
-    temp_hash = {}
-    if htype == "Personal Name"
-      temp_hash = {:q => '(((+author_pers_browse:"' + query + '") OR author_pers_browse:"' + query + '") OR ((+subject_pers_browse:"' + query + '") OR subject_pers_browse:"' + query + '"))',
-                   :qr => [query, query],
-                   :or => ["AND", "AND"],
-                   :sfr => ["author_pers_browse", "subject_pers_browse"]}
-    elsif htype == "Corporate Name"
-      temp_hash = {:q => '(((+author_corp_browse:"' + query + '") OR author_corp_browse:"' + query + '") OR ((+subject_corp_browse:"' + query + '") OR subject_corp_browse:"' + query + '"))',
-                   :qr => [query, query],
-                   :or => ["AND", "AND"],
-                   :sfr => ["author_corp_browse", "subject_corp_browse"]}
-    elsif htype ==  "Event"
-      temp_hash = {:q => '(((+author_event_browse:"' + query + '") OR author_event_browse:"' + query + '") OR ((+subject_event_browse:"' + query + '") OR subject_event_browse:"' + query + '"))',
-                   :qr => [query, query],
-                   :or => ["AND", "AND"],
-                   :sfr => ["author_event_browse", "subject_event_browse"]}
-    elsif htype ==  "Chronological Term"
-      temp_hash = {:q => '((+subject_era_browse:"' + query + '") OR subject_era_browse:"' + query + '")',
-                   :qr => [query, query],
-                   :or => ["AND"],
-                   :sfr => ["subject_era_browse"]}
-    elsif htype ==  "Genre/Form Term"
-      temp_hash = {:q => '((+subject_genr_browse:"' + query + '") OR subject_genr_browse:"' + query + '")',
-                   :qr => [query],
-                   :or => ["AND"],
-                   :sfr => ["subject_genr_browse"]}
-    elsif htype ==  "Geographic Name"
-      temp_hash = {:q => '((+subject_geo_browse:"' + query + '") OR subject_geo_browse:"' + query + '")',
-                   :qr => [query],
-                   :or => ["AND"],
-                   :sfr => ["subject_geo_browse"]}
-    elsif htype ==  "Topical Term"
-      temp_hash = {:q => '((+subject_topic_browse:"' + query + '") OR subject_topic_browse:"' + query + '")',
-                   :qr => [query],
-                   :or => ["AND"],
-                   :sfr => ["subject_topic_browse"]}
-    elsif htype ==  "Work"
-      temp_hash = {:q => '((+subject_work_browse:"' + query + '") OR subject_work_browse:"' + query + '")',
-                   :qr => [query],
-                   :or => ["AND"],
-                   :sfr => ["subject_work_browse"]}
-    end
-    return temp_hash
   end
 
   private

blacklight-cornell/app/controllers/catalog_controller.rb

@@ -17,20 +17,6 @@ class CatalogController < ApplicationController
     #prepend_before_action :set_return_path
   end
 
-  # Ensure that the configuration file is present
-  begin
-    SEARCH_API_CONFIG = YAML.load_file("#{::Rails.root}/config/search_apis.yml")
-  rescue Errno::ENOENT
-    puts <<-eos
-
-    ******************************************************************************
-    Your search_apis.yml config file is missing.
-    See config/search_apis.yml.example
-    ******************************************************************************
-
-    eos
-  end
-
   #  DACCESS-215
   def index
     if query_has_pub_date_facet? && !params.key?(:q)
@@ -962,7 +948,7 @@ def folio_request(url)
     token = folio_token
     if url && token
       headers = {
-        'X-Okapi-Tenant' => ENV['TENANT_ID'],
+        'X-Okapi-Tenant' => ENV['OKAPI_TENANT'],
         'x-okapi-token' => token,
         :accept => 'application/json, application/vnd.api+json'
       }