arclight 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 535ab37ef2a400b6159b501ec20d2e70bb69aafafdbbaf3091ed8b3198abb889
-  data.tar.gz: 86a06cba86c02986f5089c2885550dc51a0d64f7dadd40fe85692f45c88f1649
+  metadata.gz: dcb3f419a2de7718525b07816f81a8f6d957cf6e4cd999bd3cd037d8c83252e1
+  data.tar.gz: 8458d1d2031ffe66f4f6a562b808990c23a04f7d0863fa30d616fbf85e403a34
 SHA512:
-  metadata.gz: 238e0a1a27a4b5e7219a473f99030634a811eb4504465dea0844bc8f4a4ac79fb5db941a148f61be01652e158d647d6e6bc5fee5e6b1b31814d105512126167d
-  data.tar.gz: fb6d3a35fa8d4bea31af2e572ab56e58687a5d39d876c47f009c3782febe7eac0f07f12364e3ba94f78fbf2f01101fefdf3bc717a695fee18b9bc55668262df8
+  metadata.gz: 2304bd8ff0448478ceb17d021322993f8b69ab2d77a8f6148c17e223939fbc056ceca5999dd37b2af3a0f5b1a7cd658329141a48f461dd04761cd5f7ef721280
+  data.tar.gz: 81f134a1d90866588ce97f0dc60ee1bebdf213fe5a467ec9ae032fdd2301ef236eefab02ad553040f270b483f788049c90eace3e320a6b1a0b8bcf071a5a0781

data/.github/workflows/ruby.yml

@@ -16,7 +16,7 @@ jobs:
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:

data/.solr_wrapper

@@ -3,6 +3,3 @@
 collection:
   dir: solr/conf/
   name: blacklight-core
-
-# Added as workaround for https://github.com/cbeer/solr_wrapper/issues/150
-checksum: 1ff1bd22255b0ae5a1ade1d03596c1f35d4fa69fa1a16e823eaa554b30ba1311f031af6e1f95a94dbdd3a1dbf308eeb068e7303b74f83584a8bb443505078cbb

data/app/assets/stylesheets/arclight/application.scss

@@ -11,3 +11,4 @@
 @import 'modules/search_results';
 @import 'modules/show_collection';
 @import 'modules/truncator';
+@import 'modules/search_form';

data/app/assets/stylesheets/arclight/modules/layout.scss

@@ -9,7 +9,7 @@
   padding-bottom: $spacer;
   margin-bottom: $spacer * .75;
   width: 100%;
-  
+
   $bent-arrow: "data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='20' height='15'><path fill-rule='evenodd' d='M1.5 1.5A.5.5 0 0 0 1 2v4.8a2.5 2.5 0 0 0 2.5 2.5h9.793l-3.347 3.346a.5.5 0 0 0 .708.708l4.2-4.2a.5.5 0 0 0 0-.708l-4-4a.5.5 0 0 0-.708.708L13.293 8.3H3.5A1.5 1.5 0 0 1 2 6.8V2a.5.5 0 0 0-.5-.5z'></path></svg>";
 
   .breadcrumb {
@@ -131,11 +131,11 @@
     }
   }
 
-  svg.bi { 
+  svg.bi {
     vertical-align: text-bottom;
     color: $light-icon-color;
   }
-  
+
   .dropdown-item svg.bi {
     color: $dark-icon-color;
   }
@@ -144,7 +144,7 @@
 .bookmark-toggle {
   display: inline;
   margin-left: 1em;
-  
+
   .toggle-bookmark {
     display: inline;
     margin-bottom: 0;
@@ -177,7 +177,7 @@ dl.deflist dt {
   text-align: left;
 }
 
-.chronlist-head, .list-head {
+.chronlist-head, .list-head, .index-head, .table-head {
   caption-side: top;
   font-size: 1.25rem;
   font-weight: 500;

data/app/assets/stylesheets/arclight/modules/search_form.scss

@@ -0,0 +1,9 @@
+// Original style comes from https://github.com/twbs/bootstrap/blob/v5.3.2/scss/_dropdown.scss#L184
+// via https://github.com/projectblacklight/blacklight/blob/v8.1.0/app/assets/stylesheets/blacklight/_search_form.scss#L25
+.input-group > .search-autocomplete-wrapper {
+  ul {
+    li {
+      white-space: normal;
+    }
+  }
+}

data/app/assets/stylesheets/arclight/modules/truncator.scss

@@ -28,10 +28,12 @@
 
   // "view more"/"view less" text swaps when content is expanded
   .view-more {
+    color: shade-color($link-color, 20%);
     display: inline;
   }
 
   .view-less {
+    color: shade-color($link-color, 20%);
     display: none;
   }
 

data/app/components/arclight/bookmark_component.html.erb

@@ -11,7 +11,7 @@
               }) do %>
     <div class="checkbox toggle-bookmark">
       <label class="toggle-bookmark" data-checkboxsubmit-target="label">
-        <input type="checkbox" class="toggle-bookmark" data-checkboxsubmit-target="checkbox">
+        <input type="checkbox" class="toggle-bookmark" data-checkboxsubmit-target="checkbox" <%= 'checked="checked"' if bookmarked? %>>
         <span data-checkboxsubmit-target="span"><%= bookmarked? ? "#{blacklight_icon(:bookmark).html_safe}<span class=\"sr-only visually-hidden\">#{t('blacklight.search.bookmarks.present')}</span>".html_safe : "#{blacklight_icon(:bookmark).html_safe}<span class=\"sr-only visually-hidden\">#{t('blacklight.search.bookmarks.absent')}</span>".html_safe %></span>
       </label>
     </div>

data/app/components/arclight/breadcrumb_component.rb

@@ -29,7 +29,7 @@ module Arclight
       yield build_repository_link
 
       @document.parents.each do |parent|
-        yield tag.li(class: 'breadcrumb-item') { link_to(parent.label, solr_document_path(parent.global_id)) }
+        yield tag.li(class: 'breadcrumb-item') { link_to(parent.label, solr_document_path(parent.id)) }
       end
     end
 

data/app/components/arclight/breadcrumbs_hierarchy_component.html.erb

@@ -9,12 +9,12 @@
       <% if collection %>
         <li class="breadcrumb-item breadcrumb-item-2">
           <span aria-hidden="true"><%= blacklight_icon :collection, classes: 'al-collection-content-icon' %></span>
-          <span class="breadcrumb-text"><%= link_to collection.label, solr_document_path(collection.global_id) %></span>
+          <span class="breadcrumb-text"><%= link_to collection.label, solr_document_path(collection.id) %></span>
 
           <ol class="breadcrumb">
             <% parents_under_collection.each do |parent| %>
               <li class="breadcrumb-item breadcrumb-item-3">
-                <span class="breadcrumb-text"><%= link_to parent.label, solr_document_path(parent.global_id) %></span>
+                <span class="breadcrumb-text"><%= link_to parent.label, solr_document_path(parent.id) %></span>
               </li>
             <% end %>
 

data/app/components/arclight/document_collection_hierarchy_component.html.erb

@@ -1,5 +1,5 @@
 <%= content_tag :li,
-  id: @document.id,
+  id: "#{@document.id}-hierarchy-item",
   data: {
     'document-id': @document.id.to_s.parameterize,
     'document-counter': @counter,
@@ -10,7 +10,7 @@
   <div class="documentHeader" data-document-id="<%= document.id %>">
     <% if document.children? %>
       <%= link_to('',
-          "##{document.id}-collapsible-hierarchy",
+          "#collapsible-hierarchy-#{document.id}",
           class: "al-toggle-view-children#{ ' collapsed' unless show_expanded?}",
           aria: {
             label: t('arclight.hierarchy.view_all'),
@@ -24,7 +24,11 @@
       %>
     <% end %>
     <div class="index_title document-title-heading" data-turbo="false">
-      <%= helpers.link_to_document document, counter: @counter %>
+      <% if current_target? %>
+        <%= document.normalized_title %>
+      <% else %>
+        <%= helpers.link_to_document document, counter: @counter %>
+      <% end %>
       <% if document.children? %>
         <span class="badge badge-pill bg-secondary badge-secondary al-number-of-children-badge"><%= document.number_of_children %><span class="sr-only visually-hidden"><%= t(:'arclight.views.index.number_of_components', count: document.number_of_children) %></span></span>
       <% end %>
@@ -37,7 +41,7 @@
   
   <%= render Arclight::IndexMetadataFieldComponent.with_collection(@presenter&.field_presenters.select { |field| field.field_config.collection_context }, classes: ['col pl-0 my-0']) %>
   <% if document.number_of_children > 0 %>
-    <%= content_tag(:div, id: "#{document.id}-collapsible-hierarchy",
+    <%= content_tag(:div, id: "collapsible-hierarchy-#{document.id}",
       class: "collapse al-collection-context-collapsible al-hierarchy-level-#{document.component_level} #{'show' if show_expanded?}"
     ) do %>
       <%= render Arclight::DocumentComponentsHierarchyComponent.new(document: @document, target_index: target_index) %>

data/app/components/arclight/document_component.html.erb

@@ -32,7 +32,7 @@
 <% elsif document.children? %>
 <div id="contents">
   <h2 class="al-show-sub-heading"><%= t 'arclight.views.show.contents' %></h2>
-  <%= helpers.turbo_frame_tag "al-hierarchy-#{document.id}", loading: 'lazy', src: helpers.hierarchy_solr_document_path(id: document.id, paginate: true, per_page: 50) %>
+  <%= helpers.turbo_frame_tag "al-hierarchy-#{document.id}-document", loading: 'lazy', src: helpers.hierarchy_solr_document_path(id: document.id, paginate: true, key: '-document', per_page: 50) %>
 </div>
 <% end %>
 

data/app/components/arclight/document_components_hierarchy_component.html.erb

@@ -18,7 +18,7 @@
   <% end %>
 <% elsif paginate? %>
   <%# render the first N documents, and let the user expand the remaining if desired %>
-  <%= helpers.turbo_frame_tag "al-hierarchy-#{@document.id}", loading: ('lazy' unless @target_index >= 0), src: hierarchy_path(limit: @maximum_left_gap) %>
+  <%= helpers.turbo_frame_tag "al-hierarchy-#{@document.id}-sidebar", loading: ('lazy' unless @target_index >= 0), src: hierarchy_path(limit: @maximum_left_gap, key: '-sidebar') %>
   <%= tag.turbo_frame id: "al-hierarchy-#{@document.id}-right" do %>
     <ul>
       <li>
@@ -28,5 +28,5 @@
   <% end %>
 <% else %>
   <%# there aren't enough to bother paginating, so load them all at once %>
-  <%= helpers.turbo_frame_tag "al-hierarchy-#{@document.id}", loading: ('lazy' unless @target_index >= 0), src: hierarchy_path %>
+  <%= helpers.turbo_frame_tag "al-hierarchy-#{@document.id}-sidebar", loading: ('lazy' unless @target_index >= 0), src: hierarchy_path(key: '-sidebar') %>
 <% end %>

data/app/components/arclight/group_component.html.erb

@@ -7,8 +7,12 @@
         </div>
       <% end %>
       <h3><%= helpers.link_to_document document %></h3>
-      <%= tag.span(document.extent, class: 'al-document-extent badge') if document.extent %>
-      <%= render Arclight::IndexMetadataFieldComponent.with_collection(presenter.field_presenters.select { |field| !compact? || field.field_config.compact }) %>
+      <% document.extent.each do |extent| %>
+        <%= tag.span extent, class: 'al-document-extent badge' unless compact? %>
+      <% end %>
+      <dl>
+        <%= render Arclight::IndexMetadataFieldComponent.with_collection(presenter.field_presenters.select { |field| !compact? || field.field_config.compact }) %>
+      </dl>
     </div>
   </div>
 </div>

data/app/components/arclight/index_metadata_field_component.html.erb

@@ -4,8 +4,7 @@
     <%= tag.dd(class: @classes + ['truncator'], data: { controller: 'arclight-truncate' }) do %>
       <%= tag.div @field.render, class: 'content', data: { arclight_truncate_target: 'content' } %>
       <%= button_tag(type: :button, class: 'btn btn-sm btn-link px-0',
-                     data: { action: 'click->arclight-truncate#trigger' },
-                     aria: { hidden: true }) do %>
+                     data: { action: 'click->arclight-truncate#trigger' }) do %>
         <%= tag.span t('arclight.truncation.view_more'), class: 'view-more' %>
         <%= tag.span t('arclight.truncation.view_less'), class: 'view-less' %>
         <%= tag.span(class: 'icon') %>

data/app/components/arclight/search_bar_component.html.erb

@@ -1,6 +1,8 @@
 <%= render(Blacklight::SearchBarComponent.new(
       **@kwargs,
-      params: @params.merge(f: (@params[:f] || {}).except(:collection)))) do |c| %>
+      params: @params.merge(f: (@params[:f] || {}).except(:collection)),
+                            q: @q,
+                            search_field: @search_field)) do |c| %>
 
   <% c.with_before_input_group do %>
     <div class="input-group within-collection-dropdown">

data/app/components/arclight/search_bar_component.rb

@@ -25,7 +25,7 @@ module Arclight
     end
 
     def collection_name
-      @collection_name ||= Array(@params.dig(:f, :collection)).first ||
+      @collection_name ||= Array(@params.dig(:f, :collection)).reject(&:empty?).first ||
                            helpers.current_context_document&.collection_name
     end
   end

data/app/components/arclight/search_result_breadcrumbs_component.html.erb

@@ -1,3 +1,6 @@
-<div class='breadcrumb-links'>
-  <%= rendered_breadcrumbs %>
-</div>
+<dt class="visually-hidden">Collection Context</dt>
+<dd>
+  <div class='breadcrumb-links'>
+    <%= rendered_breadcrumbs %>
+  </div>
+</dd>

data/app/components/arclight/search_result_title_component.html.erb

@@ -1,7 +1,9 @@
 <header class="documentHeader row" data-document-id="<%= @document.id %>">
   <h3 class="index_title document-title-heading col">
     <%= helpers.link_to_document @document, counter: @counter %>
-    <%= tag.span @document.extent, class: 'al-document-extent badge' if @document.extent && !compact? %>
+    <% @document.extent.each do |extent| %>
+      <%= tag.span extent, class: 'al-document-extent badge' unless compact? %>
+    <% end %>    
     <%= tag.span class: 'al-document-container text-muted ml-auto' do %>
       <%= @document.containers.join(', ') %>
     <% end if @document.containers.present? %>

data/app/helpers/arclight/ead_format_helpers.rb

@@ -23,13 +23,34 @@ module Arclight
             .scrub!(:strip).to_html
     end
 
+    # rubocop:disable Metrics/AbcSize
     def ead_to_html_scrubber
       Loofah::Scrubber.new do |node|
         format_render_attributes(node) if node.attr('render').present?
+        convert_to_span(node) if CONVERT_TO_SPAN_TAGS.include? node.name
+        convert_to_br(node) if CONVERT_TO_BR_TAG.include? node.name
+        format_links(node) if %w[extptr extref extrefloc ptr ref].include? node.name
         format_lists(node) if %w[list chronlist].include? node.name
+        format_indexes(node) if node.name == 'index'
+        format_tables(node) if node.name == 'table'
         node
       end
     end
+    # rubocop:enable Metrics/AbcSize
+
+    # Tags that should be converted to <span> tags because of formatting conflicts between XML and HTML
+    CONVERT_TO_SPAN_TAGS = ['title'].freeze
+
+    # Tags that should be converted to HTML <br/> tags
+    CONVERT_TO_BR_TAG = ['lb'].freeze
+
+    def convert_to_span(node)
+      node.name = 'span'
+    end
+
+    def convert_to_br(node)
+      node.name = 'br'
+    end
 
     def condense_whitespace(str)
       str.squish.strip.gsub(/>[\n\s]+</, '><')
@@ -91,6 +112,17 @@ module Arclight
       end
     end
 
+    def format_links(node)
+      node.remove_attribute('target')
+      node.remove_attribute('type')
+      if %w[extptr extref extrefloc].include? node.name
+        node['target'] = '_blank'
+        node['class'] = 'external-link'
+      end
+      node.content = node['title'] if (%w[extptr ptr].include? node.name) && node['title'].present?
+      node.name = 'a' if node['href'].present?
+    end
+
     def format_lists(node)
       format_simple_lists(node) if node.name == 'list' && node['type'] != 'deflist'
       format_deflists(node) if node.name == 'list' && node['type'] == 'deflist'
@@ -218,5 +250,60 @@ module Arclight
       end
       multi_events.each { |event_node| event_node.name = 'div' }
     end
+
+    # Format EAD <index> elements
+    def format_indexes(node)
+      index_head = node.at_css('head')
+      index_head&.name = 'h3'
+      index_head&.add_class('index-head')
+      index_head['id'] = ['index-', index_head.text].join.parameterize if index_head.present?
+      format_indexentries(node)
+      node.name = 'div'
+    end
+
+    # Grab all of the <indexentry> children as a nodeset, move them into
+    # a <table>, wrap each entry in a <tr> & each value in a <td>.
+    def format_indexentries(node)
+      indexentries = node.css('indexentry')
+      return if indexentries.blank?
+
+      indexentries.first.previous = '<table class="table indexentries" />'
+      indexentries.map do |i|
+        i.parent = node.at_css('table.table.indexentries')
+        i.wrap('<tr/>')
+        i.element_children.map { |c| c.wrap('<td/>') }
+        # Assuming two columns in an index, create a blank cell for entries
+        # with a missing value.
+        i.add_child('<td/>') if i.element_children.count == 1
+      end
+    end
+
+    # Format EAD <table> elements, converting <tgroup> to HTML <table>.
+    # Ignoring <colspec>, @colname, @colwidth complex rendering
+    # logic for now.
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def format_tables(node)
+      node.remove_attribute('frame')
+      node.name = 'div' if node.css('tgroup').present?
+      format_table_head(node)
+      tgroups = node.css('tgroup')
+      tgroups&.map do |t|
+        t.name = 'table'
+        t.remove_attribute('cols')
+        t.add_class('table')
+        t.css('row').map { |r| r.name = 'tr' }
+        t.css('thead entry').map { |e| e.name = 'th' }
+        t.css('tbody entry').map { |e| e.name = 'td' }
+      end
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+    def format_table_head(node)
+      table_head = node.at_css('head')
+      return if table_head.blank?
+
+      table_head.name = 'h3'
+      table_head.add_class('table-head')
+    end
   end
 end

data/app/helpers/arclight_helper.rb

@@ -5,6 +5,7 @@
 module ArclightHelper
   include Arclight::EadFormatHelpers
   include Arclight::FieldConfigHelpers
+  include Blacklight::DocumentHelperBehavior
   include Blacklight::LayoutHelperBehavior
 
   def repository_collections_path(repository)
@@ -91,6 +92,16 @@ module ArclightHelper
     end
   end
 
+  ##
+  # Override of BL core https://github.com/projectblacklight/blacklight/blob/v8.1.0/app/helpers/blacklight/document_helper_behavior.rb#L55
+  # Remove document_type check. It isn't a method on arclight documents
+  # Check if the document is in the user's bookmarks
+  # @param [Blacklight::Document] document
+  # @return [Boolean]
+  def bookmarked?(document)
+    current_bookmarks.any? { |x| x.document_id == document.id }
+  end
+
   def current_context_document
     @document
   end

data/app/models/arclight/parent.rb

@@ -17,15 +17,5 @@ module Arclight
     def collection?
       level == 'collection'
     end
-
-    ##
-    # Concatenates the eadid and the id, to return an "id" in the context of
-    # Blacklight and Solr
-    # @return [String]
-    def global_id
-      return id if eadid == id
-
-      "#{eadid}#{id}"
-    end
   end
 end

data/app/models/concerns/arclight/solr_document.rb

@@ -7,11 +7,11 @@ module Arclight
     extend ActiveSupport::Concern
 
     included do
-      attribute :parent_ids, :array, 'parent_ssim'
+      attribute :parent_ids, :array, 'parent_ids_ssim'
       attribute :parent_labels, :array, 'parent_unittitles_ssm'
       attribute :parent_levels, :array, 'parent_levels_ssm'
       attribute :unitid, :string, 'unitid_ssm'
-      attribute :extent, :string, 'extent_ssm'
+      attribute :extent, :array, 'extent_ssm'
       attribute :abstract, :string, 'abstract_html_tesm'
       attribute :scope, :string, 'scopecontent_html_tesm'
       attribute :creator, :string, 'creator_ssm'
@@ -111,8 +111,13 @@ module Arclight
     end
 
     def containers
-      # NOTE: that .titlecase strips punctuation, like hyphens, we want to keep
-      fetch('containers_ssim', []).map(&:capitalize)
+      # NOTE: Keep uppercase characters if present, but upcase the first if not already
+      containers_field = fetch('containers_ssim', []).reject(&:empty?)
+      return [] if containers_field.blank?
+
+      containers_field.map do |container|
+        container.dup.sub!(/\A./, &:upcase)
+      end
     end
 
     # @return [Array<String>] with embedded highlights using <em>...</em>

data/app/views/catalog/_document_list.html.erb

@@ -0,0 +1,8 @@
+<% # Override to conditionally add id="documents" on div. When documents are grouped it causes duplicate id issues %>
+<% # https://github.com/projectblacklight/blacklight/blob/v8.1.0/app/views/catalog/_document_list.html.erb %>
+<% # container for all documents in index list view -%>
+<% view_config = local_assigns[:view_config] || blacklight_config&.view_config(document_index_view_type) %>
+<div <%= 'id="documents"'.html_safe unless grouped? %> class="al-document-listings documents-<%= view_config&.key || document_index_view_type %>">
+  <% document_presenters = documents.map { |doc| document_presenter(doc) } -%>
+  <%= render view_config.document_component.with_collection(document_presenters, partials: view_config.partials, counter_offset: @response&.start || 0) %>
+</div>

data/app/views/catalog/_group.html.erb

@@ -1,4 +1,4 @@
 <% # container for all groups in index view -%>
-<div class='al-grouped-results'>
+<div id="documents" class='al-grouped-results'>
   <%= render (blacklight_config.view_config(document_index_view_type).group_component || Arclight::GroupComponent).with_collection(@response.groups) %>
 </div>

data/arclight.gemspec

@@ -43,5 +43,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'selenium-webdriver'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'solr_wrapper'
-  spec.add_development_dependency 'webdrivers'
 end

data/lib/arclight/normalized_date.rb

@@ -39,16 +39,11 @@ module Arclight
 
     # @see http://www2.archivists.org/standards/DACS/part_I/chapter_2/4_date for rules
     def normalize
-      if inclusive.present?
-        result = inclusive.to_s
-        result << ", bulk #{bulk}" if bulk.present?
-      elsif other.present?
-        result = other.to_s
-      else
-        result = nil
-      end
-
-      result&.strip
+      result = []
+      result << inclusive if inclusive.present?
+      result << other if other.present?
+      result << "bulk #{bulk}" if bulk.present?
+      result.compact.map(&:strip).join(', ').presence
     end
   end
 end

data/lib/arclight/traject/ead2_component_config.rb

@@ -29,6 +29,7 @@ settings do
   provide 'title_normalizer', 'Arclight::NormalizedTitle'
   provide 'reader_class_name', 'Arclight::Traject::NokogiriNamespacelessReader'
   provide 'logger', Logger.new($stderr)
+  provide 'component_identifier_format', '%<root_id>s_%<ref_id>s'
 end
 
 NAME_ELEMENTS = %w[corpname famname name persname].freeze
@@ -60,6 +61,7 @@ DID_SEARCHABLE_NOTES_FIELDS = %w[
   abstract
   materialspec
   physloc
+  note
 ].freeze
 
 # ==================
@@ -67,7 +69,9 @@ DID_SEARCHABLE_NOTES_FIELDS = %w[
 #
 # NOTE: All fields should be stored in Solr
 # ==================
-to_field 'ref_ssi' do |record, accumulator, _context|
+to_field 'ref_ssi' do |record, accumulator, context|
+  next if context.output_hash['ref_ssi']
+
   accumulator << if record.attribute('id').blank?
                    strategy = Arclight::MissingIdStrategy.selected
                    hexdigest = strategy.new(record).to_hexdigest
@@ -90,10 +94,14 @@ to_field 'ref_ssm' do |_record, accumulator, context|
 end
 
 to_field 'id' do |_record, accumulator, context|
-  accumulator << [
-    settings[:root].output_hash['id'],
-    context.output_hash['ref_ssi']
-  ].join
+  next if context.output_hash['id']
+
+  data = {
+    root_id: settings[:root].output_hash['id']&.first,
+    ref_id: context.output_hash['ref_ssi']&.first
+  }
+
+  accumulator << (settings[:component_identifier_format] % data)
 end
 
 to_field 'title_filing_ssi', extract_xpath('./did/unittitle'), first_only
@@ -131,6 +139,11 @@ to_field 'parent_ssi' do |_record, accumulator, _context|
   accumulator.concat settings[:parent].output_hash['ref_ssi'] || settings[:parent].output_hash['id']
 end
 
+to_field 'parent_ids_ssim' do |_record, accumulator, _context|
+  accumulator.concat(settings[:parent].output_hash['parent_ids_ssim'] || [])
+  accumulator.concat settings[:parent].output_hash['id']
+end
+
 to_field 'parent_unittitles_ssm' do |_rec, accumulator, _context|
   accumulator.concat(settings[:parent].output_hash['parent_unittitles_ssm'] || [])
   accumulator.concat settings[:parent].output_hash['normalized_title_ssm'] || []
@@ -155,12 +168,42 @@ to_field 'collection_ssim' do |_record, accumulator, _context|
   accumulator.concat settings[:root].output_hash['normalized_title_ssm']
 end
 
-to_field 'extent_ssm', extract_xpath('./did/physdesc/extent')
-to_field 'extent_tesim', extract_xpath('./did/physdesc/extent')
+# This accumulates direct text from a physdesc, ignoring child elements handled elsewhere
+to_field 'physdesc_tesim', extract_xpath('./did/physdesc', to_text: false) do |_record, accumulator|
+  accumulator.map! do |element|
+    physdesc = []
+    element.children.map do |child|
+      next if child.instance_of?(Nokogiri::XML::Element)
+
+      physdesc << child.text&.strip unless child.text&.strip&.empty?
+    end.flatten
+    physdesc.join(' ') unless physdesc.empty?
+  end
+end
+
+to_field 'extent_ssm' do |record, accumulator|
+  physdescs = record.xpath('./did/physdesc')
+  extents_per_physdesc = physdescs.map do |physdesc|
+    extents = physdesc.xpath('./extent').map { |e| e.text.strip }
+    # Join extents within the same physdesc with an empty string
+    extents.join(' ') unless extents.empty?
+  end
+
+  # Add each physdesc separately to the accumulator
+  accumulator.concat(extents_per_physdesc)
+end
+
+to_field 'extent_tesim' do |_record, accumulator, context|
+  accumulator.concat context.output_hash['extent_ssm'] || []
+end
+
+to_field 'physfacet_tesim', extract_xpath('./did/physdesc/physfacet')
+to_field 'dimensions_tesim', extract_xpath('./did/physdesc/dimensions')
+
+to_field 'indexes_html_tesm', extract_xpath('./index', to_text: false)
+to_field 'indexes_tesim', extract_xpath('./index')
 
-to_field 'creator_ssm', extract_xpath('./did/origination')
 to_field 'creator_ssim', extract_xpath('./did/origination')
-to_field 'creators_ssim', extract_xpath('./did/origination')
 to_field 'creator_sort' do |record, accumulator|
   accumulator << record.xpath('./did/origination').map(&:text).join(', ')
 end
@@ -214,7 +257,7 @@ to_field 'digital_objects_ssm', extract_xpath('./dao|./did/dao', to_text: false)
   end
 end
 
-to_field 'date_range_ssim', extract_xpath('./did/unitdate/@normal', to_text: false) do |_record, accumulator|
+to_field 'date_range_isim', extract_xpath('./did/unitdate/@normal', to_text: false) do |_record, accumulator|
   range = Arclight::YearRange.new
   next range.years if accumulator.blank?
 
@@ -244,8 +287,6 @@ to_field 'access_subjects_ssm' do |_record, accumulator, context|
   accumulator.concat(context.output_hash.fetch('access_subjects_ssim', []))
 end
 
-to_field 'acqinfo_ssim', extract_xpath('/ead/archdesc/acqinfo/*[local-name()!="head"]')
-to_field 'acqinfo_ssim', extract_xpath('/ead/archdesc/descgrp/acqinfo/*[local-name()!="head"]')
 to_field 'acqinfo_ssim', extract_xpath('./acqinfo/*[local-name()!="head"]')
 to_field 'acqinfo_ssim', extract_xpath('./descgrp/acqinfo/*[local-name()!="head"]')
 
@@ -264,7 +305,6 @@ end
 DID_SEARCHABLE_NOTES_FIELDS.map do |selector|
   to_field "#{selector}_html_tesm", extract_xpath("./did/#{selector}", to_text: false)
 end
-to_field 'did_note_ssm', extract_xpath('./did/note')
 
 # =============================
 # Each component child document
@@ -280,6 +320,7 @@ to_field 'components' do |record, accumulator, context|
       provide :counter, context.settings[:counter]
       provide :depth, context.settings[:depth].to_i + 1
       provide :component_traject_config, context.settings[:component_traject_config]
+      provide :component_identifier_format, context.settings[:component_identifier_format]
     end
 
     i.load_config_file(context.settings[:component_traject_config])

data/lib/arclight/traject/ead2_config.rb

@@ -48,14 +48,17 @@ DID_SEARCHABLE_NOTES_FIELDS = %w[
   abstract
   materialspec
   physloc
+  note
 ].freeze
 
 settings do
+  provide 'component_traject_config', File.join(__dir__, 'ead2_component_config.rb')
+  provide 'date_normalizer', 'Arclight::NormalizedDate'
+  provide 'title_normalizer', 'Arclight::NormalizedTitle'
   provide 'reader_class_name', 'Arclight::Traject::NokogiriNamespacelessReader'
   provide 'solr_writer.commit_on_close', 'true'
   provide 'repository', ENV.fetch('REPOSITORY_ID', nil)
   provide 'logger', Logger.new($stderr)
-  provide 'component_traject_config', File.join(__dir__, 'ead2_component_config.rb')
 end
 
 each_record do |_record, context|
@@ -100,22 +103,18 @@ end
 to_field 'unitid_ssm', extract_xpath('/ead/archdesc/did/unitid')
 to_field 'unitid_tesim', extract_xpath('/ead/archdesc/did/unitid')
 
-to_field 'normalized_title_ssm' do |_record, accumulator, context|
-  dates = Arclight::NormalizedDate.new(
+to_field 'normalized_date_ssm' do |_record, accumulator, context|
+  accumulator << settings['date_normalizer'].constantize.new(
     context.output_hash['unitdate_inclusive_ssm'],
     context.output_hash['unitdate_bulk_ssim'],
     context.output_hash['unitdate_other_ssim']
   ).to_s
-  title = context.output_hash['title_ssm'].first
-  accumulator << Arclight::NormalizedTitle.new(title, dates).to_s
 end
 
-to_field 'normalized_date_ssm' do |_record, accumulator, context|
-  accumulator << Arclight::NormalizedDate.new(
-    context.output_hash['unitdate_inclusive_ssm'],
-    context.output_hash['unitdate_bulk_ssim'],
-    context.output_hash['unitdate_other_ssim']
-  ).to_s
+to_field 'normalized_title_ssm' do |_record, accumulator, context|
+  title = context.output_hash['title_ssm']&.first
+  date = context.output_hash['normalized_date_ssm']&.first
+  accumulator << settings['title_normalizer'].constantize.new(title, date).to_s
 end
 
 to_field 'collection_title_tesim' do |_record, accumulator, context|
@@ -185,11 +184,41 @@ to_field 'digital_objects_ssm', extract_xpath('/ead/archdesc/did/dao|/ead/archde
   end
 end
 
-to_field 'extent_ssm', extract_xpath('/ead/archdesc/did/physdesc/extent')
-to_field 'extent_tesim', extract_xpath('/ead/archdesc/did/physdesc/extent')
+# This accumulates direct text from a physdesc, ignoring child elements handled elsewhere
+to_field 'physdesc_tesim', extract_xpath('/ead/archdesc/did/physdesc', to_text: false) do |_record, accumulator|
+  accumulator.map! do |element|
+    physdesc = []
+    element.children.map do |child|
+      next if child.instance_of?(Nokogiri::XML::Element)
+
+      physdesc << child.text&.strip unless child.text&.strip&.empty?
+    end.flatten
+    physdesc.join(' ') unless physdesc.empty?
+  end
+end
+
+to_field 'extent_ssm' do |record, accumulator|
+  physdescs = record.xpath('/ead/archdesc/did/physdesc')
+  extents_per_physdesc = physdescs.map do |physdesc|
+    extents = physdesc.xpath('./extent').map { |e| e.text.strip }
+    # Join extents within the same physdesc with an empty string
+    extents.join(' ') unless extents.empty?
+  end
+
+  # Add each physdesc separately to the accumulator
+  accumulator.concat(extents_per_physdesc)
+end
+
+to_field 'extent_tesim' do |_record, accumulator, context|
+  accumulator.concat context.output_hash['extent_ssm'] || []
+end
+
+to_field 'physfacet_tesim', extract_xpath('/ead/archdesc/did/physdesc/physfacet')
+to_field 'dimensions_tesim', extract_xpath('/ead/archdesc/did/physdesc/dimensions')
+
 to_field 'genreform_ssim', extract_xpath('/ead/archdesc/controlaccess/genreform')
 
-to_field 'date_range_ssim', extract_xpath('/ead/archdesc/did/unitdate/@normal', to_text: false) do |_record, accumulator|
+to_field 'date_range_isim', extract_xpath('/ead/archdesc/did/unitdate/@normal', to_text: false) do |_record, accumulator|
   range = Arclight::YearRange.new
   next range.years if accumulator.blank?
 
@@ -198,6 +227,9 @@ to_field 'date_range_ssim', extract_xpath('/ead/archdesc/did/unitdate/@normal',
   accumulator.replace range.years
 end
 
+to_field 'indexes_html_tesm', extract_xpath('/ead/archdesc/index', to_text: false)
+to_field 'indexes_tesim', extract_xpath('/ead/archdesc/index')
+
 SEARCHABLE_NOTES_FIELDS.map do |selector|
   to_field "#{selector}_html_tesm", extract_xpath("/ead/archdesc/#{selector}/*[local-name()!='head']", to_text: false) do |_record, accumulator|
     accumulator.map!(&:to_html)

data/lib/arclight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arclight
-  VERSION = '1.0.1'
+  VERSION = '1.1.1'
 end

data/lib/generators/arclight/install_generator.rb

@@ -22,7 +22,7 @@ module Arclight
     def install_blacklight_locale_picker
       gem 'blacklight-locale_picker'
 
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         run 'bundle install'
       end
 

data/lib/generators/arclight/templates/catalog_controller.rb

@@ -139,13 +139,13 @@ class CatalogController < ApplicationController
     #  (note: It is case sensitive when searching values)
 
     config.add_facet_field 'collection', field: 'collection_ssim', limit: 10
-    config.add_facet_field 'creator', field: 'creator_ssim', limit: 10
-    config.add_facet_field 'date_range', field: 'date_range_ssim', range: true
+    config.add_facet_field 'creators', field: 'creator_ssim', limit: 10
+    config.add_facet_field 'date_range', field: 'date_range_isim', range: true
     config.add_facet_field 'level', field: 'level_ssim', limit: 10
     config.add_facet_field 'names', field: 'names_ssim', limit: 10
     config.add_facet_field 'repository', field: 'repository_ssim', limit: 10
-    config.add_facet_field 'place', field: 'geogname_ssim', limit: 10
-    config.add_facet_field 'subject', field: 'access_subjects_ssim', limit: 10
+    config.add_facet_field 'places', field: 'geogname_ssim', limit: 10
+    config.add_facet_field 'access_subjects', field: 'access_subjects_ssim', limit: 10
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
@@ -231,6 +231,20 @@ class CatalogController < ApplicationController
         pf:  '${pf_title}'
       }
     end
+    config.add_search_field 'container', label: 'Container' do |field|
+      field.qt = 'search'
+      field.solr_parameters = {
+        qf:  '${qf_container}',
+        pf:  '${pf_container}'
+      }
+    end
+    config.add_search_field 'identifier', label: 'Identifier' do |field|
+      field.qt = 'search'
+      field.solr_parameters = {
+        qf:  '${qf_identifier}',
+        pf:  '${pf_identifier}'
+      }
+    end
 
     # These are the parameters passed through in search_state.params_for_search
     config.search_state_fields += %i[id group hierarchy_context original_document]
@@ -262,7 +276,7 @@ class CatalogController < ApplicationController
     # ===========================
 
     # Collection Show Page - Summary Section
-    config.add_summary_field 'creators', field: 'creators_ssim', link_to_facet: true
+    config.add_summary_field 'creators', field: 'creator_ssim', link_to_facet: true
     config.add_summary_field 'abstract', field: 'abstract_html_tesm', helper_method: :render_html_tags
     config.add_summary_field 'extent', field: 'extent_ssm'
     config.add_summary_field 'language', field: 'language_ssim'
@@ -279,7 +293,13 @@ class CatalogController < ApplicationController
     config.add_background_field 'accruals', field: 'accruals_html_tesm', helper_method: :render_html_tags
     config.add_background_field 'phystech', field: 'phystech_html_tesm', helper_method: :render_html_tags
     config.add_background_field 'physloc', field: 'physloc_html_tesm', helper_method: :render_html_tags
+    config.add_background_field 'physdesc', field: 'physdesc_tesim', helper_method: :render_html_tags
+    config.add_background_field 'physfacet', field: 'physfacet_tesim', helper_method: :render_html_tags
+    config.add_background_field 'dimensions', field: 'dimensions_tesim', helper_method: :render_html_tags
+    config.add_background_field 'materialspec', field: 'materialspec_html_tesm', helper_method: :render_html_tags
+    config.add_background_field 'fileplan', field: 'fileplan_html_tesm', helper_method: :render_html_tags
     config.add_background_field 'descrules', field: 'descrules_ssm', helper_method: :render_html_tags
+    config.add_background_field 'note', field: 'note_html_tesm', helper_method: :render_html_tags
 
     # Collection Show Page - Related Section
     config.add_related_field 'relatedmaterial', field: 'relatedmaterial_html_tesm', helper_method: :render_html_tags
@@ -287,6 +307,7 @@ class CatalogController < ApplicationController
     config.add_related_field 'otherfindaid', field: 'otherfindaid_html_tesm', helper_method: :render_html_tags
     config.add_related_field 'altformavail', field: 'altformavail_html_tesm', helper_method: :render_html_tags
     config.add_related_field 'originalsloc', field: 'originalsloc_html_tesm', helper_method: :render_html_tags
+    config.add_related_field 'odd', field: 'odd_html_tesm', helper_method: :render_html_tags
 
     # Collection Show Page - Indexed Terms Section
     config.add_indexed_terms_field 'access_subjects', field: 'access_subjects_ssim', link_to_facet: true, separator_options: {
@@ -307,6 +328,9 @@ class CatalogController < ApplicationController
       last_word_connector: '<br/>'
     }
 
+    config.add_indexed_terms_field 'indexes', field: 'indexes_html_tesm',
+                                              helper_method: :render_html_tags
+
     # ==========================
     # COMPONENT SHOW PAGE FIELDS
     # ==========================
@@ -319,17 +343,32 @@ class CatalogController < ApplicationController
     }, if: lambda { |_context, _field_config, document|
       document.containers.present?
     }
+    config.add_component_field 'creators', field: 'creator_ssim', link_to_facet: true
     config.add_component_field 'abstract', field: 'abstract_html_tesm', helper_method: :render_html_tags
     config.add_component_field 'extent', field: 'extent_ssm'
     config.add_component_field 'scopecontent', field: 'scopecontent_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'language', field: 'language_ssim'
     config.add_component_field 'acqinfo', field: 'acqinfo_ssim', helper_method: :render_html_tags
+    config.add_component_field 'bioghist', field: 'bioghist_html_tesm', helper_method: :render_html_tags
     config.add_component_field 'appraisal', field: 'appraisal_html_tesm', helper_method: :render_html_tags
     config.add_component_field 'custodhist', field: 'custodhist_html_tesm', helper_method: :render_html_tags
     config.add_component_field 'processinfo', field: 'processinfo_html_tesm', helper_method: :render_html_tags
     config.add_component_field 'arrangement', field: 'arrangement_html_tesm', helper_method: :render_html_tags
     config.add_component_field 'accruals', field: 'accruals_html_tesm', helper_method: :render_html_tags
     config.add_component_field 'phystech', field: 'phystech_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'materialspec', field: 'materialspec_html_tesm', helper_method: :render_html_tags
     config.add_component_field 'physloc', field: 'physloc_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'physdesc', field: 'physdesc_tesim', helper_method: :render_html_tags
+    config.add_component_field 'physfacet', field: 'physfacet_tesim', helper_method: :render_html_tags
+    config.add_component_field 'dimensions', field: 'dimensions_tesim', helper_method: :render_html_tags
+    config.add_component_field 'fileplan', field: 'fileplan_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'altformavail', field: 'altformavail_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'otherfindaid', field: 'otherfindaid_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'odd', field: 'odd_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'relatedmaterial', field: 'relatedmaterial_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'separatedmaterial', field: 'separatedmaterial_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'originalsloc', field: 'originalsloc_html_tesm', helper_method: :render_html_tags
+    config.add_component_field 'note', field: 'note_html_tesm', helper_method: :render_html_tags
 
     # Component Show Page - Indexed Terms Section
     config.add_component_indexed_terms_field 'access_subjects', field: 'access_subjects_ssim', link_to_facet: true, separator_options: {
@@ -350,6 +389,9 @@ class CatalogController < ApplicationController
       last_word_connector: '<br/>'
     }
 
+    config.add_component_indexed_terms_field 'indexes', field: 'indexes_html_tesm',
+                                              helper_method: :render_html_tags
+
     # =================
     # ACCESS TAB FIELDS
     # =================

data/lib/generators/arclight/templates/config/locales/arclight.en.yml

@@ -18,6 +18,10 @@ en:
         accruals: Accruals
         phystech: Physical / technical requirements
         physloc: Physical location
+        physdesc: Physical description
+        physfacet: Physical facet
+        dimensions: Dimensions
+        indexes: Indexes
         descrules: Rules or conventions
 
         relatedmaterial: Related material
@@ -25,6 +29,11 @@ en:
         otherfindaid: Other finding aids
         altformavail: Alternative form available
         originalsloc: Location of originals
+        materialspec: Material specific details
+        fileplan: File plan
+        odd: Other descriptive data
+        note: Note
+        did_note: Note
 
         access_subjects: Subjects
         names_coll: Names

data/lib/generators/arclight/templates/config/repositories.yml

@@ -7,7 +7,7 @@ nlm:
     <div class="al-repository-street-address-building">Building 38, Room 1E-21</div>
     <div class="al-repository-street-address-address1">8600 Rockville Pike</div>
     <div class="al-repository-street-address-city_state_zip_country">Bethesda, MD 20894, USA</div>
-  thumbnail_url: "https://collections.nlm.nih.gov/pageturnerserver/ajaxp?theurl=http://localhost:8080/fedora/get/nlm:nlmuid-101421040-img/THUMB"
+  thumbnail_url: "https://upload.wikimedia.org/wikipedia/commons/thumb/8/8b/United_States_National_Library_of_Medicine_1999.jpg/500px-United_States_National_Library_of_Medicine_1999.jpg"
   request_types:
     google_form:
       request_url: 'https://docs.google.com/a/stanford.edu/forms/d/e/1FAIpQLSeOamhY_IcFw4sPnz0ddwWWkrPaHbM5wp7JVbOLOL_mIusEyw/viewform'
@@ -24,7 +24,7 @@ sul-spec:
     <div class="al-repository-street-address-building">Green Library</div>
     <div class="al-repository-street-address-address1">557 Escondido Mall</div>
     <div class="al-repository-street-address-city_state_zip_country">Stanford, CA 94305, USA</div>
-  thumbnail_url: 'https://library.stanford.edu/sites/default/files/styles/150x150/public/collection/image/Collections-Super-Enlight.jpg'
+  thumbnail_url: 'https://upload.wikimedia.org/wikipedia/commons/thumb/2/2b/Stanford_University_Green_Library_Bing_Wing.jpg/500px-Stanford_University_Green_Library_Bing_Wing.jpg'
   request_types:
     aeon_web_ead:
       request_url: 'https://sample.request.com'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arclight",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "The frontend for arclight",
   "main": "app/assets/javascript/arclight/arclight.js",
   "files": [

data/solr/conf/schema.xml

@@ -338,6 +338,7 @@
    <copyField source="places_ssim" dest="place_teim"/>
    <copyField source="names_ssim" dest="name_teim"/>
    <copyField source="access_subjects_ssim" dest="subject_teim"/>
+   <copyField source="containers_ssim" dest="container_teim" />
 
    <!-- The catch all `text` field -->
    <!-- grab the fielded searches -->
@@ -345,9 +346,11 @@
    <copyField source="places_ssim" dest="text" />
    <copyField source="names_ssim" dest="text" />
    <copyField source="access_subjects_ssim" dest="text" />
+   <copyField source="containers_ssim" dest="text" />
+
    <!-- grab the searchable notes -->
    <copyField source="abstract_tesim" dest="text" />
-   <copyField source="accessrestricct_tesim" dest="text" />
+   <copyField source="accessrestrict_tesim" dest="text" />
    <copyField source="accruals_tesim" dest="text" />
    <copyField source="acqinfo_tesim" dest="text" />
    <copyField source="altformavail_tesim" dest="text" />
@@ -358,10 +361,13 @@
    <copyField source="custodhist_tesim" dest="text" />
    <copyField source="did_note_tesim" dest="text" />
    <copyField source="fileplan_tesim" dest="text" />
+   <copyField source="indexes_tesim" dest="text" />
+   <copyField source="language_ssim" dest="text" />
    <copyField source="materialspec_tesim" dest="text" />
    <copyField source="note_tesim" dest="text" />
    <copyField source="odd_tesim" dest="text" />
    <copyField source="originalsloc_tesim" dest="text" />
+   <copyField source="parent_unittitles_tesim" dest="text" />
    <copyField source="physdesc_tesim" dest="text" />
    <copyField source="physloc_tesim" dest="text" />
    <copyField source="phystech_tesim" dest="text" />

data/solr/conf/solrconfig.xml

@@ -75,7 +75,15 @@
        <int name="rows">10</int>
 
        <str name="q.alt">*:*</str>
-       <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
+
+       <!-- Minimum Should Match parameter (mm) -->
+       <str name="mm">4&lt;90%</str>
+       <!-- 1-4 term query, all must match
+            5+ term query, 90% must match; rounded down, so e.g.:
+            * 5-10 term query, all but one must match
+            * 11-20 term query, all but two must match
+            * 21-29 term query, all but three must match, etc.
+       -->
 
        <!-- this qf and pf are used by default, if not otherwise specified by
             client. The default blacklight_config will use these for the
@@ -85,6 +93,11 @@
             http://wiki.apache.org/solr/LocalParams
        -->
 
+       <!-- In general, matches using the pf parameter should be boosted higher
+            than qf, so the proximity of multiple search terms in the matching
+            documents is significant in relevance scoring. See:
+            https://solr.apache.org/guide/solr/latest/query-guide/dismax-query-parser.html#pf-phrase-fields-parameter
+       -->
        <str name="qf">
          collection_title_tesim^150
          title_tesim^100
@@ -93,84 +106,86 @@
          name_teim^10
          place_teim^10
          subject_teim^2
+         id
+         ead_ssi
+         ref_ssm
+         unitid_ssm
+         container_teim
+         parent_unittitles_tesim
          text
        </str>
        <str name="pf">
-         collection_title_tesim^150
-         title_tesim^100
-         normalized_title_teim^100
-         unitid_identifier_match^40
-         name_teim^10
-         place_teim^10
-         subject_teim^2
-         text
+         collection_title_tesim^300
+         title_tesim^200
+         normalized_title_teim^200
+         unitid_identifier_match^80
+         name_teim^20
+         place_teim^20
+         subject_teim^5
+         id^2
+         ead_ssi^2
+         ref_ssm^2
+         unitid_ssm^2
+         container_teim^2
+         parent_unittitles_tesim^2
+         text^2
        </str>
 
+       <str name="qf_container">
+         container_teim
+       </str>
+       <str name="pf_container">
+         container_teim^2
+       </str>
+       <str name="qf_identifier">
+         id
+         ead_ssi
+         ref_ssm
+         unitid_ssm
+       </str>
+       <str name="pf_identifier">
+         id^2
+         ead_ssi^2
+         ref_ssm^2
+         unitid_ssm^2
+       </str>
        <str name="qf_name">
          name_teim
        </str>
        <str name="pf_name">
-         name_teim
+         name_teim^2
        </str>
        <str name="qf_place">
          place_teim
        </str>
        <str name="pf_place">
-         place_teim
+         place_teim^2
        </str>
        <str name="qf_subject">
          subject_teim
        </str>
        <str name="pf_subject">
-         subject_teim
+         subject_teim^2
        </str>
        <str name="qf_title">
          title_tesim
          normalized_title_teim
        </str>
        <str name="pf_title">
-         title_tesim
-         normalized_title_teim
+         title_tesim^2
+         normalized_title_teim^2
        </str>
 
        <int name="ps">3</int>
        <float name="tie">0.01</float>
 
-       <str name="fl">
-         id,
-         score,
-         abstract_html_tesm,
-         accessrestrict_html_tesm,
-         child_component_count_isi,
-         containers_ssim,
-         creator_ssm,
-         extent_ssm,
-         geogname_ssm,
-         has_online_content_ssim,
-         language_ssim,
-         level_ssm,
-         repository_ssm,
-         scopecontent_html_tesm,
-         title_ssm,
-         normalized_title_ssm,
-         normalized_date_ssm,
-         unitid_ssm,
-         parent_ssim,
-         parent_unittitles_ssm,
-         ead_ssi,
-         ref_ssm,
-         component_level_isim,
-         parent_access_restrict_tesm,
-         parent_access_terms_tesm,
-         names_coll_ssim
-         places_ssim
-       </str>
+       <str name="fl">*</str>
 
        <str name="facet">true</str>
        <str name="facet.mincount">1</str>
        <str name="facet.field">level_ssim</str>
        <str name="facet.field">creator_ssim</str>
-       <str name="facet.field">date_range_ssim</str>
+       <str name="facet.field">date_range_isim</str>
        <str name="facet.field">names_ssim</str>
        <str name="facet.field">geogname_ssim</str>
        <str name="facet.field">access_subjects_ssim</str>

data/template.rb

@@ -2,9 +2,9 @@
 
 gem 'arclight'
 
-run 'bundle install'
+after_bundle do
+  generate 'blacklight:install', '--devise'
+  generate 'arclight:install', '-f'
 
-generate 'blacklight:install', '--devise'
-generate 'arclight:install', '-f'
-
-rake 'db:migrate'
+  rake 'db:migrate'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arclight
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Darren Hardy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -271,20 +271,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ''
 email:
 - drh@stanford.edu
@@ -336,6 +322,7 @@ files:
 - app/assets/stylesheets/arclight/modules/mastheads.scss
 - app/assets/stylesheets/arclight/modules/repositories.scss
 - app/assets/stylesheets/arclight/modules/repository_card.scss
+- app/assets/stylesheets/arclight/modules/search_form.scss
 - app/assets/stylesheets/arclight/modules/search_results.scss
 - app/assets/stylesheets/arclight/modules/show_collection.scss
 - app/assets/stylesheets/arclight/modules/truncator.scss
@@ -431,6 +418,7 @@ files:
 - app/views/arclight/requests/_aeon_external_request_endpoint.html.erb
 - app/views/arclight/requests/_aeon_web_ead.html.erb
 - app/views/arclight/requests/_google_form.html.erb
+- app/views/catalog/_document_list.html.erb
 - app/views/catalog/_group.html.erb
 - app/views/catalog/_group_toggle.html.erb
 - app/views/catalog/_search_results_header.html.erb
@@ -513,7 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: A Blacklight-based environment to support discovery and delivery for archives