Merge branch 'main' into fix_subject_label

app/controllers/catalog_controller.rb

@@ -264,7 +264,7 @@ class CatalogController < ApplicationController
     # SECONDARY
     # Find This Item
     config.add_show_field 'repository_tesim', label: 'Repository', link_to_facet: 'repository_sim'
-    config.add_show_field 'local_identifier_ssm', label: 'Local identifier'
+    config.add_show_field 'local_identifier_ssim', label: 'Local identifier'
     config.add_show_field 'oclc_ssi', label: 'OCLC Number'
     config.add_show_field 'iiif_manifest_url_ssi', label: 'Manifest url'
     config.add_show_field 'finding_aid_url_ssm', label: 'Finding aid url'

app/models/concerns/mods_arce_solr_document.rb

@@ -11,7 +11,7 @@ def to_mods_arce
         # xml['mods'].identifier({ type: 'ladybird' }, "oid#{self[:id]}")
         # xml['mods'].identifier({ displayLabel: 'Accession Number', type: 'local' }, self[:accessionNumber_ssi]) if self[:accessionNumber_ssi].present?
         # xml['mods'].identifier({ displayLabel: 'Barcode', type: 'local' }, self[:orbisBarcode_ssi]) if self[:orbisBarcode_ssi].present?
-        self[:local_identifier_ssm]&.each { |local_identifier| xml['mods'].identifier({ type: 'local' }, local_identifier.to_s) } if self[:local_identifier_ssm].present?
+        self[:local_identifier_ssim]&.each { |local_identifier| xml['mods'].identifier({ type: 'local' }, local_identifier.to_s) } if self[:local_identifier_ssim].present?
         self[:note_tesim]&.each { |abstract| xml['mods'].abstract abstract.to_s }
         self[:license_tesim]&.each { |access| xml['mods'].accessCondition({ type: "use and reproduction", displayLabel: "license" }, access.to_s) }
         self[:local_rights_statement_ssm]&.each { |access| xml['mods'].accessCondition({ type: "local rights statements" }, access.to_s) }

app/services/search_field_service.rb

@@ -30,7 +30,7 @@ class SearchFieldService
     'illustrations_note_tesim',
     'inscription_tesim',
     'incipit_tesim',
-    'local_identifier_ssm',
+    'local_identifier_ssim',
     'location_tesim',
     'lyricist_tesim',
     'medium_tesim',

config/locales/blacklight.en.yml

@@ -83,7 +83,7 @@ en:
           extent_tesim: 'Extent'
           genre_tesim: 'Genre'
           identifier_tesim: 'Identifier'
-          local_identifier_ssm: 'Local Identifier'
+          local_identifier_ssim: 'Local Identifier'
           location_tesim: 'Location'
           named_subject_tesim: 'Names'
           normalized_date_sim: 'Date'
@@ -121,7 +121,7 @@ en:
           identifier_tesim: 'Identifier'
           human_readable_language_tesim: 'Language'
           latitude_tesim: 'Longitude'
-          local_identifier_ssm: 'Local Identifier'
+          local_identifier_ssim: 'Local Identifier'
           location_tesim: 'Location'
           longitude_tesim: 'Latitude'
           lyricist_tesim: 'Lyricist'

config/metadata/find_collection_metadata.yml

@@ -1,5 +1,5 @@
 repository_tesim: "Repository"
-local_identifier_ssm: "Local identifier"
+local_identifier_ssim: "Local identifier"
 oclc_ssi: "OCLC Number"
 ark_ssi: "ARK"
 opac_url_ssi: "Opac url"

config/metadata/find_this_item_metadata.yml

@@ -1,5 +1,5 @@
 repository_tesim: "Repository"
-local_identifier_ssm: "Local identifier"
+local_identifier_ssim: "Local identifier"
 opac_url_tesim: "Opac url"
 oclc_ssi: "OCLC Number"
 ark_ssi: "ARK"

config/oai.yml

@@ -74,7 +74,7 @@ default:
   identifier:
     - masterFilename
     - itemCallNumber
-    - local_identifier_ssm
+    - local_identifier_ssim
     - opac_url_ssi
     - oclc_ssi
     - ark_ssi

config/secondary_metadata.yml

@@ -1,5 +1,5 @@
 repository_tesim: 'Repository'
-local_identifier_ssm: 'Local identifier'
+local_identifier_ssim: 'Local identifier'
 # OCLC Number
 ark_ssi: 'ARK'
 # Rights statement

spec/controllers/catalog_controller_spec.rb

@@ -76,7 +76,7 @@
        "identifier_tesim", "illuminator_tesim", "illustrator_tesim",
        "iiif_manifest_url_ssi", "illustrations_note_tesim", "incipit_tesim",
        "inscription_tesim", "keyword_tesim", "latitude_tesim",
-       "local_rights_statement_ssm", "location_tesim", "local_identifier_ssm",
+       "local_rights_statement_ssm", "location_tesim", "local_identifier_ssim",
        "longitude_tesim", "lyricist_tesim", "medium_tesim",
        "member_of_collections_ssim", "named_subject_tesim", "note_tesim",
        "oclc_ssi", "opac_url_ssi", "page_layout_ssim", "photographer_tesim",

spec/presenters/ursus/find_collection_metadata_presenter_spec.rb

@@ -5,7 +5,7 @@
   let(:solr_doc) do
     {
       'repository_tesim' => 'Repository',
-      'local_identifier_ssm' => 'Local identifier',
+      'local_identifier_ssim' => 'Local identifier',
       'oclc_ssi' => 'OCLC Number',
       'ark_ssi' => 'ARK',
       'opac_url_ssi' => 'Opac url'
@@ -14,7 +14,7 @@
   let(:solr_doc_missing_items) do
     {
       'repository_tesim' => 'Repository',
-      'local_identifier_ssm' => 'Local identifier',
+      'local_identifier_ssim' => 'Local identifier',
       'oclc_ssi' => 'OCLC Number'
     }
   end
@@ -29,7 +29,7 @@
       end
 
       it 'returns the Local identifier Key' do
-        expect(config['local_identifier_ssm'].to_s).to eq('Local identifier')
+        expect(config['local_identifier_ssim'].to_s).to eq('Local identifier')
       end
 
       it 'returns the OCLC Number Key' do

spec/presenters/ursus/find_this_item_metadata_presenter_spec.rb

@@ -5,7 +5,7 @@
   let(:solr_doc) do
     {
       'repository_tesim' => 'Repository',
-      'local_identifier_ssm' => 'Local identifier',
+      'local_identifier_ssim' => 'Local identifier',
       'opac_url_tesim' => 'Opac url',
       'oclc_ssi' => 'OCLC Number',
       'ark_ssi' => 'ARK'
@@ -14,7 +14,7 @@
   let(:solr_doc_missing_items) do
     {
       'repository_tesim' => 'Repository',
-      'local_identifier_ssm' => 'Local identifier',
+      'local_identifier_ssim' => 'Local identifier',
       'oclc_ssi' => 'OCLC Number'
     }
   end
@@ -29,7 +29,7 @@
       end
 
       it 'returns the Local identifier Key' do
-        expect(config['local_identifier_ssm'].to_s).to eq('Local identifier')
+        expect(config['local_identifier_ssim'].to_s).to eq('Local identifier')
       end
 
       it 'returns the Opac url' do

spec/presenters/ursus/tagline_metadata_presenter_spec.rb

@@ -7,7 +7,7 @@
       'ark_ssi' => 'test',
       'title_tesim' => 'Test record',
       'repository_tesim' => 'Test Repository',
-      'local_identifier_ssm' => '890_abc',
+      'local_identifier_ssim' => '890_abc',
       'oclc_ssi' => 'abc123_oclc',
       'dlcs_collection_name_ssm' => 'Collection 1',
       'resource_type_tesim' => 'still image'
@@ -19,7 +19,7 @@
       'ark_ssi' => 'test',
       'title_tesim' => 'Test record',
       'repository_tesim' => 'Test Repository',
-      'local_identifier_ssm' => '890_abc',
+      'local_identifier_ssim' => '890_abc',
       'oclc_ssi' => 'abc123_oclc',
       'dlcs_collection_name_ssm' => 'Collection 1',
       'resource_type_tesim' => 'still image',

spec/services/search_field_service_spec.rb

@@ -5,6 +5,6 @@
 RSpec.describe SearchFieldService do
   let(:search_field_service) { described_class.instance }
   it 'returns the correct list of search fields' do
-    expect(search_field_service.search_fields).to eq(['ark_ssi', 'artist_tesim', 'alternative_title_tesim', 'architect_tesim', 'author_tesim', 'binding_note_tesim', 'caption_tesim', 'collation_tesim', 'colophon_tesim', 'composer_tesim', 'condition_note_ssi', 'contents_note_tesim', 'contributor_tesim', 'creator_tesim', 'date_created_tesim', 'description_tesim', 'explicit_tesim', 'features_tesim', 'foliation_tesim', 'genre_tesim', 'human_readable_language_tesim', 'identifier_tesim', 'illuminator_tesim', 'illustrations_note_tesim', 'inscription_tesim', 'incipit_tesim', 'local_identifier_ssm', 'location_tesim', 'lyricist_tesim', 'medium_tesim', 'named_subject_tesim', 'page_layout_ssim', 'opac_url_ssi', 'page_layout_ssim', 'photographer_tesim', 'place_of_origin_tesim', 'producer_tesim', 'provenance_tesim', 'publisher_tesim', 'scribe_tesim', 'script_tesim', 'series_tesim', 'combined_subject_ssim', 'summary_tesim', 'support_tesim', 'title_tesim', 'toc_tesim', 'uniform_title_tesim', 'hand_note_tesim', 'writing_system_tesim', 'uniform_title_tesim', 'shelfmark_ssi', 'descriptive_title_tesim', 'delivery_tesim', 'other_versions_tesim', 'repository_tesim', 'host_tesim', 'musician_tesim', 'printer_tesim', 'researcher_tesim', 'format_book_tesim', 'resp_statement_tesim', 'citation_source_tesim'].join(' '))
+    expect(search_field_service.search_fields).to eq(['ark_ssi', 'artist_tesim', 'alternative_title_tesim', 'architect_tesim', 'author_tesim', 'binding_note_tesim', 'caption_tesim', 'collation_tesim', 'colophon_tesim', 'composer_tesim', 'condition_note_ssi', 'contents_note_tesim', 'contributor_tesim', 'creator_tesim', 'date_created_tesim', 'description_tesim', 'explicit_tesim', 'features_tesim', 'foliation_tesim', 'genre_tesim', 'human_readable_language_tesim', 'identifier_tesim', 'illuminator_tesim', 'illustrations_note_tesim', 'inscription_tesim', 'incipit_tesim', 'local_identifier_ssim', 'location_tesim', 'lyricist_tesim', 'medium_tesim', 'named_subject_tesim', 'page_layout_ssim', 'opac_url_ssi', 'page_layout_ssim', 'photographer_tesim', 'place_of_origin_tesim', 'producer_tesim', 'provenance_tesim', 'publisher_tesim', 'scribe_tesim', 'script_tesim', 'series_tesim', 'combined_subject_ssim', 'summary_tesim', 'support_tesim', 'title_tesim', 'toc_tesim', 'uniform_title_tesim', 'hand_note_tesim', 'writing_system_tesim', 'uniform_title_tesim', 'shelfmark_ssi', 'descriptive_title_tesim', 'delivery_tesim', 'other_versions_tesim', 'repository_tesim', 'host_tesim', 'musician_tesim', 'printer_tesim', 'researcher_tesim', 'format_book_tesim', 'resp_statement_tesim', 'citation_source_tesim'].join(' '))
   end
 end

spec/support/works.rb

@@ -19,7 +19,7 @@
   rights_country_tesim: ['US'],
   rights_holder_tesim: ['Charles E. Young'],
   normalized_date_sim: ['1934-56-78'], # unique value so we can test it doesn't display
-  local_identifier_ssm: ['local id 123'],
+  local_identifier_ssim: ['local id 123'],
   date_created_tesim: ["September 17, 1947"],
   medium_tesim: ['1 photograph'],
   extent_tesim: ['1 photograph'],

spec/system/link_breaks_spec.rb

@@ -31,7 +31,7 @@
       rights_country_tesim: ['US'],
       rights_holder_tesim: ['Charles E. Young'],
       normalized_date_tesim: ['1934-56-78'], # unique value so we can test it doesn't display
-      local_identifier_ssm: ['local id 123'],
+      local_identifier_ssim: ['local id 123'],
       date_created_tesim: ["September 17, 1947"],
       medium_tesim: ['1 photograph'],
       extent_tesim: ['1 photograph'],

spec/system/show_collection_spec.rb

@@ -21,7 +21,7 @@
       accessControl_ssim: ['7b1af782-af1f-46a6-9bd2-b53be0f1bb68'],
       title_tesim: ['Bennett (Walter E.) Photographic Collection, 1937-1983 (bulk 1952-1982)'],
       collection_type_gid_ssim: ['gid://californica/hyrax-collectiontype/1'],
-      local_identifier_ssm: ['Collection 686'],
+      local_identifier_ssim: ['Collection 686'],
       normalized_date_tesim: ['1937/1983'],
       photographer_tesim: ['Bennett, Walter E. (Walter Edward), 1921-1995'],
       repository_tesim: ['University of California, Los Angeles. Library Special Collections'],
@@ -71,7 +71,7 @@
     # expect(page).to have_selector('.primary-metadata')
     # expect(page).to have_selector('.secondary-metadata')
     # expect(page.find('div.secondary-metadata dd.blacklight-services_contact_ssm').text).to eq 'UCLA'
-    # expect(page.find('div.secondary-metadata dd.blacklight-local_identifier_ssm').text).to eq 'Collection 686'
+    # expect(page.find('div.secondary-metadata dd.blacklight-local_identifier_ssim').text).to eq 'Collection 686'
 
     expect(page).to have_content 'Bennett (Walter E.) Photographic Collection, 1937-1983 (bulk 1952-1982)'
     expect(page).to have_content 'LOCAL IDENTIFIER  Collection 686'

spec/system/suppress_discovery_collection_spec.rb

@@ -21,7 +21,7 @@
       accessControl_ssim: ['7b1af782-af1f-46a6-9bd2-b53be0f1bb68'],
       title_tesim: ['Zen and the Art of Motorcycle Maintenance: An Inquiry Into Values'],
       collection_type_gid_ssim: ['gid://californica/hyrax-collectiontype/1'],
-      local_identifier_ssm: ['Collection 686'],
+      local_identifier_ssim: ['Collection 686'],
       normalized_date_tesim: ['1937/1983'],
       photographer_tesim: ['Bennett, Walter E. (Walter Edward), 1921-1995'],
       repository_tesim: ['University of California, Los Angeles. Library Special Collections'],

spec/system/suppress_private_collection_spec.rb

@@ -19,7 +19,7 @@
       accessControl_ssim: ['7b1af782-af1f-46a6-9bd2-b53be0f1bb68'],
       title_tesim: ['Zen and the Art of Motorcycle Maintenance: An Inquiry Into Values'],
       collection_type_gid_ssim: ['gid://californica/hyrax-collectiontype/1'],
-      local_identifier_ssm: ['Collection 686'],
+      local_identifier_ssim: ['Collection 686'],
       normalized_date_tesim: ['1937/1983'],
       photographer_tesim: ['Bennett, Walter E. (Walter Edward), 1921-1995'],
       repository_tesim: ['University of California, Los Angeles. Library Special Collections'],