pennmarc 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f7c00af4fabc0cb127ce3bfc16e02e2b13611db0aa8184fca48392a5776295
-  data.tar.gz: c34a742ed5b5bc1f1eb1d76a564738e0e48df3607e59ec69851a7428876225cb
+  metadata.gz: 248327cbd8c1447d2ff8a6d857d47a12cc9c5952f3432f86ef559faa3ca4201c
+  data.tar.gz: a5fd079bf3e1a0bf6fcb77de70e78f0dbd75b330b7c3ddfeb70c3aa9a1b29837
 SHA512:
-  metadata.gz: f64552e53b3547222f785bf3f24f593448a3e4587baa309d194ca48fee961d9846b40c590b4e2a8709592557c95a0c52b922c5c4fe9be89058cc85aefe2c2e76
-  data.tar.gz: 999d8a04a067bf9a1a88d4d0adba0947fda547446b89d5f989541ea18c087d0ab804dde297f67704cbfcd6ca5be4047db4296ffb87f4e68b9c81e991b954c316
+  metadata.gz: e10f30375935e9b9f4adba832b935c350a6e7f2460d4742f3951edf6d5b7c7dddc261335bf634ccc282893b2d24135fe2551b027e5d8ecfaba6886ba6fd98d88
+  data.tar.gz: fe87ecedca3979f909d2e2d64cfd956b3e9c3836eb2dcb3f23f60aef07c1754a1621a4ab84cdeb5be699e0c1029a58a34c70b6fa3d18069d95c83d1635ed751a

data/lib/pennmarc/helpers/access.rb

@@ -16,15 +16,16 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array]
       def facet(record)
-        acc = record.filter_map do |field|
+        values = record.filter_map do |field|
           next AT_THE_LIBRARY if physical_holding_tag?(field)
           next ONLINE if electronic_holding_tag?(field)
         end
 
-        return acc if acc.size == 2 # return early if all values are already present
+        return values if values.size == 2 # return early if all values are already present
 
-        acc << ONLINE if acc.exclude?(ONLINE) && finding_aid_linkage?(record) # only check if ONLINE isn't already there
-        acc
+        # only check if ONLINE isn't already there
+        values << ONLINE if values.exclude?(ONLINE) && finding_aid_linkage?(record)
+        values.uniq
       end
 
       private

data/lib/pennmarc/helpers/format.rb

@@ -27,7 +27,7 @@ module PennMARC
       WEBSITE_DATABASE = 'Website/Database'
 
       # Get any Format values from {https://www.oclc.org/bibformats/en/3xx/300.html 300},
-      # 254, 255, 310, 342, 352 or {https://www.oclc.org/bibformats/en/3xx/340.html 340} field. based on the source
+      # 254, 255, 310, 342, 352, 362 or {https://www.oclc.org/bibformats/en/3xx/340.html 340} field. based on the source
       # field, different subfields are used.
       # @note ported from get_format_display
       # @param [MARC::Record] record
@@ -39,6 +39,9 @@ module PennMARC
         end
         results += record.fields('340').map { |f| join_subfields(f, &subfield_not_in?(%w[0 2 6 8])) }
         results += record.fields('880').map do |f|
+          # skip any 880s associated with non format fields
+          next unless subfield_value_in?(f, '6', %w[254 255 300 310 340 342 352 362])
+
           subfield_to_ignore = if subfield_value?(f, 6, /^300/)
                                  %w[3 6 8]
                                elsif subfield_value?(f, 6, /^340/)

data/lib/pennmarc/helpers/location.rb

@@ -4,6 +4,7 @@ module PennMARC
   # Methods that return Library and Location values from Alma enhanced MARC fields
   class Location < Helper
     ONLINE_LIBRARY = 'Online library'
+    WEB_LOCATION_CODE = 'web'
 
     class << self
       # Retrieves library location from enriched marc 'itm' or 'hld' fields, giving priority to the item location over
@@ -41,43 +42,45 @@ module PennMARC
       # @param [Hash] location_map hash with location_code as key and location hash as value
       # @return [Array<String>]
       def location(record:, display_value:, location_map:)
-        # get enriched marc location tag and subfield code
-        location_tag_and_subfield_code(record) => {tag:, subfield_code:}
+        # get enriched marc location tag and relevant subfields
+        enriched_location_tag_and_subfields(record) => {tag:, location_code_sf:, call_num_sf:}
 
         locations = record.fields(tag).flat_map { |field|
           field.filter_map { |subfield|
             # skip unless subfield code does not match enriched marc tag subfield code
-            next unless subfield.code == subfield_code
+            next unless subfield.code == location_code_sf
 
-            # skip if subfield value is 'web'
-            # 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.
-            next if subfield.value == 'web'
+            location_code = subfield.value
 
-            # skip unless subfield value is a key in location_map
-            # sometimes "happening locations" are mistakenly used in holdings records.
-            # that's a data problem that should be fixed.
-            # here, if we encounter a code we can't map, we ignore it, for faceting purposes
-            next unless location_map.key?(subfield.value.to_sym)
+            next if location_code_to_ignore?(location_map, location_code)
 
-            location_map[subfield.value.to_sym][display_value.to_sym]
+            override = specific_location_override(display_value: display_value, location_code: location_code,
+                                                  field: field, call_num_sf: call_num_sf)
+
+            if override.present?
+              override
+            else
+              location_map[location_code.to_sym][display_value.to_sym]
+            end
           }.flatten.compact_blank
         }.uniq
         if record.tags.intersect?([Enriched::Pub::ELEC_INVENTORY_TAG, Enriched::Api::ELEC_INVENTORY_TAG])
           locations << ONLINE_LIBRARY
         end
+
         locations
       end
 
       private
 
-      # Determine enriched marc location tag ('itm' or 'hld') and subfield code, giving priority to using 'itm' tag and
-      # subfield.
+      # Determine enriched marc location tag, location code subfield, and call number subfield,
+      # giving priority to using 'itm', 'AVA', or 'AVE' fields.
       # @param [MARC::Record]
       # @return [Hash<String, String>] containing location tag and subfield code
       # - `:tag` (String): The enriched marc location tag
-      # - `:subfield_code` (String): The relevant subfield code
-      def location_tag_and_subfield_code(record)
+      # - `:location_code_sf` (String): The subfield code where location code is stored
+      # - `:call_num_sf` (String): The subfield code where call number is stored
+      def enriched_location_tag_and_subfields(record)
         # in holdings records, the shelving location is always the permanent location.
         # in item records, the current location takes into account
         # temporary locations and permanent locations. if you update the item's perm location,
@@ -89,18 +92,57 @@ module PennMARC
         # if the record has an enriched item field present, use it
         if field_defined?(record, Enriched::Pub::ITEM_TAG)
           tag = Enriched::Pub::ITEM_TAG
-          subfield_code = Enriched::Pub::ITEM_CURRENT_LOCATION
-        # if the record has API inventory tags, use them
+          location_code_sf = Enriched::Pub::ITEM_CURRENT_LOCATION
+          call_num_sf = Enriched::Pub::ITEM_CALL_NUMBER
+          # if the record has API inventory tags, use them
         elsif field_defined?(record, Enriched::Api::PHYS_INVENTORY_TAG)
           tag = Enriched::Api::PHYS_INVENTORY_TAG
-          subfield_code = Enriched::Api::PHYS_LOCATION_CODE
-        # otherwise use Pub holding tags
+          location_code_sf = Enriched::Api::PHYS_LOCATION_CODE
+          call_num_sf = Enriched::Api::PHYS_CALL_NUMBER
+          # otherwise use Pub holding tags
         else
           tag = Enriched::Pub::PHYS_INVENTORY_TAG
-          subfield_code = Enriched::Pub::PHYS_LOCATION_CODE
+          location_code_sf = Enriched::Pub::PHYS_LOCATION_CODE
+          call_num_sf = Enriched::Pub::HOLDING_CLASSIFICATION_PART
+        end
+
+        { tag: tag, location_code_sf: location_code_sf, call_num_sf: call_num_sf }
+      end
+
+      # Determines whether to ignore a location code.
+      # We ignore location codes that are not keys in the location map. Sometimes "happening locations" are
+      # mistakenly used in holdings records. That's a data problem that should be fixed. If we encounter a code we can't
+      # map, we ignore it, for faceting purposes. We also ignore the location code 'web'. 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.
+      # @param [location_map] location_map hash with location_code as key and location hash as value
+      # @param [location_code] location_code retrieved from record
+      # @return [Boolean]
+      def location_code_to_ignore?(location_map, location_code)
+        location_map.key?(location_code.to_sym) == false || location_code == WEB_LOCATION_CODE
+      end
+
+      # Retrieves a specific location override based on location code and call number. Specific location overrides are
+      # located in `location_overrides.yml`.
+      # @param [String] display_value
+      # @param [String] location_code
+      # @param [MARC::Field] field
+      # @param [String] call_num_sf
+      # @return [String, Nil]
+      def specific_location_override(display_value:, location_code:, field:, call_num_sf:)
+        return unless display_value == :specific_location
+
+        locations_overrides = Mappers.location_overrides
+
+        call_numbers = subfield_values(field, call_num_sf)
+
+        override = locations_overrides.select do |_key, value|
+          value[:location_code] == location_code && call_numbers.any? { |num| num.match?(value[:call_num_pattern]) }
         end
 
-        { tag: tag, subfield_code: subfield_code }
+        return if override.blank?
+
+        override[override.keys.first][:specific_location]
       end
     end
   end

data/lib/pennmarc/helpers/note.rb

@@ -166,12 +166,19 @@ module PennMARC
         system_details_notes.uniq
       end
 
+      # Retrieve "With" notes for display from field {https://www.loc.gov/marc/bibliographic/bd501.html 501}
+      # @param [Marc::Record] record
+      # @return [Array<String>]
+      def bound_with_show(record)
+        record.fields('501').filter_map { |field| join_subfields(field, &subfield_in?(['a'])).presence }.uniq
+      end
+
       private
 
       # For system details: extract subfield ǂ3 plus other subfields as specified by passed-in block. Pays special
       # attention to punctuation, joining subfield ǂ3 values with a colon-space (': ').
       # @param [MARC::DataField] field
-      # @param [Proc] selector
+      # @param [Proc] &
       # @return [String]
       def sub3_and_other_subs(field, &)
         sub3 = field.filter_map { |sf| trim_trailing('period', sf.value) if sf.code == '3' }.join(': ')

data/lib/pennmarc/helpers/subject.rb

@@ -160,7 +160,6 @@ module PennMARC
 
       # Format a term hash as a string for display
       #
-      # @todo confirm punctuation handling
       # @todo support search field formatting?
       # @param [Symbol] type
       # @param [Hash] term components and information as a hash
@@ -171,11 +170,12 @@ module PennMARC
         # attempt to handle poorly coded record
         normalize_single_subfield(term[:parts].first) if term[:count] == 1 && term[:parts].first.present?
 
-        case type.to_sym
+        case type
         when :facet
-          term[:parts].join('--').strip
+          trim_trailing(:period, term[:parts].join('--').strip)
         when :display
-          "#{term[:parts].join('--')} #{term[:append].join(' ')}".strip
+          display_value = "#{term[:parts].join('--')} #{term[:append].join(' ')}".strip
+          display_value.ends_with?('.') ? display_value : "#{display_value}."
         end
       end
 
@@ -225,9 +225,8 @@ module PennMARC
       #       because we're using (where? - MK) "subdivision count" as a heuristic for the quality level of the
       #       heading. - MG
       # @todo do i need all this?
-      # @todo do i need to handle punctuation? see append_new_part
       # @param [MARC::DataField] field
-      # @return [Hash{Symbol => Integer, Array}, Nil]
+      # @return [Hash{Symbol => Integer, Array, Boolean}, Nil]
       def build_subject_hash(field)
         term_info = { count: 0, parts: [], append: [], uri: nil,
                       local: field.indicator2 == '4' || field.tag.starts_with?('69'), # local subject heading
@@ -243,6 +242,9 @@ module PennMARC
             # filter out PRO/CHR entirely (but only need to check on local heading types)
             return nil if term_info[:local] && subfield.value =~ /^%?(PRO|CHR)([ $]|$)/
 
+            # remove trailing punctuation of previous subject part
+            trim_trailing_commas_or_periods!(term_info[:parts].last)
+
             term_info[:parts] << subfield.value.strip
             term_info[:count] += 1
           when '2'
@@ -252,11 +254,16 @@ module PennMARC
             term_info[:append] << subfield.value.strip # TODO: map relator code?
           when 'b', 'c', 'd', 'p', 'q', 't'
             # these are appended to the last component (part) if possible (i.e., when joined, should have no delimiter)
-            term_info[:parts].last << ", #{subfield.value.strip}"
+            # assume that there is an 'a' preceding value
+            term_info[:parts].last << " #{subfield.value.strip}"
             term_info[:count] += 1
           else
             # the usual case; add a new component to `parts`
             # this typically includes g, v, x, y, z, 4
+
+            # remove trailing punctuation of previous subject part
+            trim_trailing_commas_or_periods!(term_info[:parts].last)
+
             term_info[:parts] << subfield.value.strip
             term_info[:count] += 1
           end
@@ -299,6 +306,15 @@ module PennMARC
         first_part.gsub!(/([[[:alpha:]])])\s+-\s+([[:upper:]]|[[:digit:]]{2,})/, '\1--\2')
         first_part.gsub!(/([[[:alnum:]])])\s+-\s+([[:upper:]])/, '\1--\2')
       end
+
+      # removes trailing comma or period, manipulating the string in place
+      # @param [String, NilClass] subject_part
+      # @return [String, NilClass]
+      def trim_trailing_commas_or_periods!(subject_part)
+        return if subject_part.blank?
+
+        trim_trailing!(:comma, subject_part) || trim_trailing!(:period, subject_part)
+      end
     end
   end
 end

data/lib/pennmarc/mappers.rb

@@ -18,6 +18,11 @@ module PennMARC
         @location ||= load_map('locations.yml')
       end
 
+      # @return [Hash]
+      def location_overrides
+        @location_overrides ||= load_map('location_overrides.yml')
+      end
+
       # @return [Hash]
       def relator
         @relator ||= load_map('relator.yml')

data/lib/pennmarc/mappings/location_overrides.yml

@@ -0,0 +1,5 @@
+albrecht:
+  location_code: 'vanp'
+  call_num_pattern: '^M.*'
+  specific_location: 'Van Pelt - Albrecht Music Library'
+

data/lib/pennmarc/util.rb

@@ -5,6 +5,13 @@ require_relative 'heading_control'
 module PennMARC
   # class to hold "utility" methods used in MARC parsing methods
   module Util
+    TRAILING_PUNCTUATIONS_PATTERNS = { semicolon: /\s*;\s*$/,
+                                       colon: /\s*:\s*$/,
+                                       equal: /=$/,
+                                       slash: %r{\s*/\s*$},
+                                       comma: /\s*,\s*$/,
+                                       period: /\.\s*$/ }.freeze # TODO: revise to exclude "etc."
+
     # Check if a given record has a field present by tag (e.g., '041')
     # @param [MARC::Record] record
     # @param [String] marc_field
@@ -115,14 +122,17 @@ module PennMARC
 
     # @param [Symbol|String] trailer to target for removal
     # @param [String] string to modify
+    # @return [String]
     def trim_trailing(trailer, string)
-      map = { semicolon: /\s*;\s*$/,
-              colon: /\s*:\s*$/,
-              equal: /=$/,
-              slash: %r{\s*/\s*$},
-              comma: /\s*,\s*$/,
-              period: /\.\s*$/ } # TODO: revise to exclude "etc."
-      string.sub map[trailer.to_sym], ''
+      string.sub TRAILING_PUNCTUATIONS_PATTERNS[trailer.to_sym], ''
+    end
+
+    # trim trailing punctuation, manipulating string in place
+    # @param [Symbol|String] trailer to target for removal
+    # @param [String] string to modify
+    # @return [String, Nil] string to modify
+    def trim_trailing!(trailer, string)
+      string.sub! TRAILING_PUNCTUATIONS_PATTERNS[trailer.to_sym], ''
     end
 
     # Intelligently append given punctuation to the end of a string

data/lib/pennmarc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PennMARC
-  VERSION = '1.0.15'
+  VERSION = '1.0.16'
 end

data/spec/lib/pennmarc/helpers/format_spec.rb

@@ -181,6 +181,20 @@ describe 'PennMARC::Format' do
         expect(value.join(' ')).not_to include 'excluded'
       end
     end
+
+    context 'with an unrelated linked alternate' do
+      let(:fields) do
+        [marc_field(tag: '300', subfields: { a: '96 pages ;', c: '23 cm ' }),
+         marc_field(tag: '880', subfields: { '6': '700', a: 'Schweizer, Shlomo,', d: '1903-',
+                                             '0': 'https://id.loc.gov/authorities/names/no95018724' })]
+      end
+
+      it 'returns the expected format values' do
+        value = helper.show(record)
+        expect(value).to contain_exactly '96 pages ; 23 cm'
+        expect(value.join(' ')).not_to include 'https://id.loc.gov/authorities/names/no95018724'
+      end
+    end
   end
 
   describe '.other_show' do

data/spec/lib/pennmarc/helpers/location_spec.rb

@@ -111,4 +111,20 @@ describe 'PennMARC::Location' do
       end
     end
   end
+
+  context 'with a specific location override' do
+    let(:record) do
+      marc_record(fields: [marc_field(tag: enriched_marc::Pub::ITEM_TAG,
+                                      subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'vanp',
+                                                   enriched_marc::Pub::ITEM_CALL_NUMBER => 'ML3534 .D85 1984' }),
+                           marc_field(tag: enriched_marc::Pub::ITEM_TAG,
+                                      subfields: { enriched_marc::Pub::ITEM_CURRENT_LOCATION => 'stor',
+                                                   enriched_marc::Pub::ITEM_CALL_NUMBER => 'L3534 .D85 1984' })])
+    end
+
+    it 'returns expected values' do
+      expect(helper.location(record: record, display_value: :specific_location, location_map: mapping))
+        .to(contain_exactly(PennMARC::Mappers.location_overrides[:albrecht][:specific_location], 'LIBRA'))
+    end
+  end
 end

data/spec/lib/pennmarc/helpers/note_spec.rb

@@ -296,5 +296,23 @@ text for URI http://www.universal.resource/locator'.squish,
         )
       end
     end
+
+    describe '.bound_with_show' do
+      let(:record) { marc_record(fields: fields) }
+
+      let(:fields) do
+        [
+          marc_field(tag: '501', subfields: { a: 'With: Peer Gynt (Suite) no. 1-2 / Edvard Grieg' }),
+          marc_field(tag: '501', subfields: { a: 'With: Schumann, C. Romances, piano, op. 11. No. 2' })
+        ]
+      end
+
+      let(:values) { helper.bound_with_show(record) }
+
+      it 'returns expected values' do
+        expect(values).to contain_exactly('With: Peer Gynt (Suite) no. 1-2 / Edvard Grieg',
+                                          'With: Schumann, C. Romances, piano, op. 11. No. 2')
+      end
+    end
   end
 end

data/spec/lib/pennmarc/helpers/subject_spec.rb

@@ -101,7 +101,7 @@ describe 'PennMARC::Subject' do
       let(:fields) do
         [marc_field(tag: '650', indicator2: '7',
                     subfields: {
-                      a: 'Libraries', d: '22nd Century', x: 'History', e: 'relator',
+                      a: 'Libraries,', d: '22nd Century,', x: 'History.', e: 'relator',
                       '2': 'fast', '0': 'http://fast.org/libraries'
                     })]
       end
@@ -127,6 +127,21 @@ describe 'PennMARC::Subject' do
         expect(values.first).to eq 'Libraries, 22nd Century--History'
       end
     end
+
+    context 'with a record with trailing periods' do
+      let(:fields) do
+        [marc_field(tag: '600', indicator2: '0',
+                    subfields: {
+                      a: 'R.G.', q: '(Robert Gordon).',
+                      t: 'Spiritual order and Christian liberty proved to be consistent in the Churches of Christ. '
+                    })]
+      end
+
+      it 'drops the final trailing period' do
+        expect(values).to contain_exactly('R.G. (Robert Gordon). Spiritual order and Christian liberty proved ' \
+                                          'to be consistent in the Churches of Christ')
+      end
+    end
   end
 
   describe '.show' do
@@ -146,8 +161,8 @@ describe 'PennMARC::Subject' do
       end
 
       it 'shows all valid subject headings without duplicates' do
-        expect(helper.show(record)).to contain_exactly('Nephrology--Periodicals', 'Nephrology', 'Kidney Diseases',
-                                                       'Local Heading')
+        expect(helper.show(record)).to contain_exactly('Nephrology--Periodicals.', 'Nephrology.', 'Kidney Diseases.',
+                                                       'Local Heading.')
       end
     end
 
@@ -155,7 +170,7 @@ describe 'PennMARC::Subject' do
       let(:fields) do
         [marc_field(tag: '650', indicator2: '0', subfields: {
                       a: 'Subways',
-                      z: ['Pennsylvania', 'Philadelphia Metropolitan Area'],
+                      z: ['Pennsylvania,', 'Philadelphia Metropolitan Area,'],
                       v: 'Maps',
                       y: '1989',
                       e: 'relator'
@@ -163,7 +178,7 @@ describe 'PennMARC::Subject' do
       end
 
       it 'properly formats the heading parts' do
-        expect(values.first).to eq 'Subways--Pennsylvania--Philadelphia Metropolitan Area--Maps--1989 relator'
+        expect(values.first).to eq 'Subways--Pennsylvania--Philadelphia Metropolitan Area--Maps--1989 relator.'
       end
     end
 
@@ -171,20 +186,37 @@ describe 'PennMARC::Subject' do
       let(:fields) do
         [marc_field(tag: '600', indicator2: '7', subfields: {
                       a: 'Franklin, Benjamin,',
-                      d: '1706-1790',
+                      d: '1706-1790.',
                       '2': 'fast',
                       '0': 'http://id.worldcat.org/fast/34115'
                     }),
          marc_field(tag: '600', indicator1: '1', indicator2: '0', subfields: {
                       a: 'Franklin, Benjamin,',
-                      d: '1706-1790.',
+                      d: '1706-1790',
                       x: 'As inventor.'
+                    }),
+         marc_field(tag: '650', indicator1: '1', indicator2: '0', subfields: {
+                      a: 'Franklin stoves.'
                     })]
       end
 
-      it 'returns what Franklin shows', pending: 'proper handling of punctuation in subject parts' do
+      it 'properly handles punctuation in subject parts' do
         expect(values).to contain_exactly 'Franklin, Benjamin, 1706-1790.',
-                                          'Franklin, Benjamin, 1706-1790--As inventor.'
+                                          'Franklin, Benjamin, 1706-1790--As inventor.', 'Franklin stoves.'
+      end
+    end
+
+    context 'with a record without trailing period in last subject part' do
+      let(:fields) do
+        [marc_field(tag: '651', indicator2: '7',
+                    subfields: {
+                      a: 'New York State (State)', z: 'New York', '2': 'fast', '0': '(OCoLC)fst01204333',
+                      '1': 'https://id.oclc.org/worldcat/entity/E39QbtfRvQh7864Jh4rDGBFDWc'
+                    })]
+      end
+
+      it 'adds a trailing period' do
+        expect(values).to contain_exactly('New York State (State)--New York.')
       end
     end
 
@@ -200,40 +232,40 @@ describe 'PennMARC::Subject' do
       end
 
       it 'properly formats the heading parts' do
-        expect(values.first).to eq 'Chicago (Ill.)--Moral conditions--Church minutes--1875-1878'
+        expect(values.first).to eq 'Chicago (Ill.)--Moral conditions--Church minutes--1875-1878.'
       end
     end
 
     context 'with a robust 611 heading including many subfields' do
       let(:fields) do
         [marc_field(tag: '611', indicator2: '0', subfields: {
-                      a: 'Conference',
-                      c: ['(Johannesburg, South Africa', 'Cape Town, South Africa'],
+                      a: 'Conference,',
+                      c: ['(Johannesburg, South Africa,', 'Cape Town, South Africa,'],
                       d: '2002)',
                       n: '2nd'
                     })]
       end
 
       it 'properly formats the heading parts' do
-        expect(values.first).to eq 'Conference, (Johannesburg, South Africa, Cape Town, South Africa, 2002)--2nd'
+        expect(values.first).to eq 'Conference, (Johannesburg, South Africa, Cape Town, South Africa, 2002)--2nd.'
       end
     end
 
     context 'with a robust 600 heading including many subfields' do
       let(:fields) do
         [marc_field(tag: '600', indicator2: '0', subfields: {
-                      a: 'Person, Significant Author',
-                      b: 'Numerator',
-                      c: %w[Title Rank],
-                      d: '1899-1971',
+                      a: 'Person, Significant Author,',
+                      b: 'Numerator,',
+                      c: ['Title,', 'Rank,'],
+                      d: '1899-1971,',
                       t: 'Collection',
-                      v: 'Early works to 1950'
+                      v: 'Early works to 1950.'
                     })]
       end
 
       it 'properly formats the heading parts' do
         expect(values.first).to eq('Person, Significant Author, Numerator, Title, Rank, 1899-1971, Collection--' \
-                                   'Early works to 1950')
+                                   'Early works to 1950.')
       end
     end
   end
@@ -249,7 +281,7 @@ describe 'PennMARC::Subject' do
     let(:values) { helper.childrens_show(record) }
 
     it 'includes heading terms only from subject tags with an indicator 2 of "1"' do
-      expect(values).to contain_exactly 'Frogs--Fiction', 'Toads--Fiction'
+      expect(values).to contain_exactly 'Frogs--Fiction.', 'Toads--Fiction.'
     end
   end
 
@@ -267,7 +299,7 @@ describe 'PennMARC::Subject' do
     end
 
     it 'includes heading terms only from subject tags with indicator 2 of "2"' do
-      expect(helper.medical_show(record)).to contain_exactly 'Nephrology'
+      expect(helper.medical_show(record)).to contain_exactly 'Nephrology.'
     end
   end
 
@@ -280,7 +312,7 @@ describe 'PennMARC::Subject' do
     end
 
     it 'includes heading terms only from subject tags with indicator 2 of "4" or in the 69X range' do
-      expect(helper.local_show(record)).to contain_exactly 'Local--Heading', 'Super Local.'
+      expect(helper.local_show(record)).to contain_exactly 'Local--Heading.', 'Super Local.'
     end
   end
 end

data/spec/support/marc_spec_helpers.rb

@@ -72,13 +72,14 @@ module MarcSpecHelpers
   #   location_map[:stor][:library] #=> 'LIBRA'
   # @return [Hash]
   def location_map
-    {
-      dent: {  specific_location: 'Levy Dental Medicine Library - Stacks',
+    { dent: {  specific_location: 'Levy Dental Medicine Library - Stacks',
                library: ['Health Sciences Libraries', 'Levy Dental Medicine Library'],
                display: 'Levy Dental Medicine Library - Stacks' },
       stor: { specific_location: 'LIBRA',
               library: 'LIBRA',
-              display: 'LIBRA' }
-    }
+              display: 'LIBRA' },
+      vanp: { specific_location: 'Van Pelt - Stacks',
+              library: 'Van Pelt-Dietrich Library Center',
+              display: 'Van Pelt Library' } }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-06 00:00:00.000000000 Z
+date: 2024-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,6 +119,7 @@ files:
 - lib/pennmarc/mappings/iso639-2-languages.yml
 - lib/pennmarc/mappings/iso639-3-languages.yml
 - lib/pennmarc/mappings/loc_classification.yml
+- lib/pennmarc/mappings/location_overrides.yml
 - lib/pennmarc/mappings/locations.yml
 - lib/pennmarc/mappings/relator.yml
 - lib/pennmarc/parser.rb