pennmarc 0.0.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b68bae786cc1cd9bcd1bb53e401be81bc3a97d4bb4319c6b37f9089898721424
-  data.tar.gz: ca840e625b1fbfe4e8e9cd9ef042eb2f8afbc8323e620b8fcb7f190d2e65c71c
+  metadata.gz: e574f1fae4f59435df3bf467da310ae7e426d82c2fe54ae2321ad326c05e5e99
+  data.tar.gz: de545e5a150b26c73e814e36b167bb688d267a97205cf4cdbab15dfd5c3225a8
 SHA512:
-  metadata.gz: 5d7c2a945285aec3959c3594414f937005ed981c4ed0d7c6ffb567456f7c25ec7a08dfb06fb0cb8316b482743637724b756d348596946e909087a7ad51d4e658
-  data.tar.gz: e542bb11f7174cbfe3bb1f55aac1ac769a7fd004dc828354e09ac52911ffee680f3782189181d0d28617e2db9557c1cf654ae40f3c3f9e467b2e11657d9a33a2
+  metadata.gz: 3c3fc981f5999eaca710a54fa3d247f2d01cc8183e13212151afab0cbb5b37f93531cbd264b22d1d4f30ef730b800efe38039b4bfc42a44cd28778c06f0cde3f
+  data.tar.gz: 729f0f80fd9d9ade7d1ae1085610cd85b8ab31beb1245efcaee246a18c01238abd5adc18dcf995f624448d518f4e36222a71c972d00c537c6367229f7d8d35c6

data/.rubocop.yml

@@ -0,0 +1,4 @@
+inherit_from: .rubocop_todo.yml
+
+inherit_gem:
+  upennlib-rubocop: upennlib_rubocop_defaults.yml

data/.rubocop_todo.yml

@@ -0,0 +1,143 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 10000`
+# on 2023-08-14 17:52:48 UTC using RuboCop version 1.51.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 22
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
+Metrics/AbcSize:
+  Exclude:
+    - 'lib/pennmarc/helpers/creator.rb'
+    - 'lib/pennmarc/helpers/edition.rb'
+    - 'lib/pennmarc/helpers/format.rb'
+    - 'lib/pennmarc/helpers/genre.rb'
+    - 'lib/pennmarc/helpers/location.rb'
+    - 'lib/pennmarc/helpers/note.rb'
+    - 'lib/pennmarc/helpers/production.rb'
+    - 'lib/pennmarc/helpers/relation.rb'
+    - 'lib/pennmarc/helpers/series.rb'
+    - 'lib/pennmarc/helpers/subject.rb'
+    - 'lib/pennmarc/helpers/title.rb'
+    - 'lib/pennmarc/util.rb'
+
+# Offense count: 5
+# Configuration parameters: CountComments, Max, CountAsOne.
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/pennmarc/helpers/creator.rb'
+    - 'lib/pennmarc/helpers/format.rb'
+    - 'lib/pennmarc/helpers/series.rb'
+    - 'lib/pennmarc/helpers/subject.rb'
+    - 'lib/pennmarc/helpers/title.rb'
+
+# Offense count: 18
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/pennmarc/helpers/creator.rb'
+    - 'lib/pennmarc/helpers/database.rb'
+    - 'lib/pennmarc/helpers/edition.rb'
+    - 'lib/pennmarc/helpers/format.rb'
+    - 'lib/pennmarc/helpers/genre.rb'
+    - 'lib/pennmarc/helpers/note.rb'
+    - 'lib/pennmarc/helpers/production.rb'
+    - 'lib/pennmarc/helpers/relation.rb'
+    - 'lib/pennmarc/helpers/series.rb'
+    - 'lib/pennmarc/helpers/subject.rb'
+    - 'lib/pennmarc/helpers/title.rb'
+    - 'lib/pennmarc/util.rb'
+
+# Offense count: 24
+# Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
+Metrics/MethodLength:
+  Exclude:
+    - 'lib/pennmarc/helpers/creator.rb'
+    - 'lib/pennmarc/helpers/date.rb'
+    - 'lib/pennmarc/helpers/edition.rb'
+    - 'lib/pennmarc/helpers/format.rb'
+    - 'lib/pennmarc/helpers/location.rb'
+    - 'lib/pennmarc/helpers/note.rb'
+    - 'lib/pennmarc/helpers/production.rb'
+    - 'lib/pennmarc/helpers/relation.rb'
+    - 'lib/pennmarc/helpers/series.rb'
+    - 'lib/pennmarc/helpers/subject.rb'
+    - 'lib/pennmarc/helpers/title.rb'
+
+# Offense count: 1
+# Configuration parameters: CountComments, Max, CountAsOne.
+Metrics/ModuleLength:
+  Exclude:
+    - 'lib/pennmarc/util.rb'
+
+# Offense count: 12
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
+Metrics/PerceivedComplexity:
+  Exclude:
+    - 'lib/pennmarc/helpers/creator.rb'
+    - 'lib/pennmarc/helpers/edition.rb'
+    - 'lib/pennmarc/helpers/format.rb'
+    - 'lib/pennmarc/helpers/genre.rb'
+    - 'lib/pennmarc/helpers/note.rb'
+    - 'lib/pennmarc/helpers/production.rb'
+    - 'lib/pennmarc/helpers/series.rb'
+    - 'lib/pennmarc/helpers/title.rb'
+    - 'lib/pennmarc/util.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, BlockForwardingName.
+# SupportedStyles: anonymous, explicit
+Naming/BlockForwarding:
+  Exclude:
+    - 'lib/pennmarc/util.rb'
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'lib/pennmarc/helpers/relation.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
+# SupportedStyles: snake_case, normalcase, non_integer
+# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+Naming/VariableNumber:
+  Exclude:
+    - 'lib/pennmarc/util.rb'
+
+# Offense count: 6
+# Configuration parameters: Max, CountAsOne.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/lib/pennmarc/helpers/creator_spec.rb'
+    - 'spec/lib/pennmarc/helpers/note_spec.rb'
+    - 'spec/lib/pennmarc/helpers/production_spec.rb'
+    - 'spec/lib/pennmarc/marc_util_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'spec/lib/pennmarc/parser_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: Max, AllowedGroups.
+RSpec/NestedGroups:
+  Exclude:
+    - 'spec/lib/pennmarc/helpers/format_spec.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Include.
+# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb
+Rails/Output:
+  Exclude:
+    - 'lib/pennmarc/helpers/date.rb'

data/Gemfile

@@ -7,6 +7,7 @@ gem 'library_stdnums', '~> 1.6'
 gem 'marc', '~> 1.2'
 gem 'nokogiri', '~> 1.15'
 gem 'rake', '~> 13.0'
+gem 'upennlib-rubocop', require: false
 
 group :test, :development do
   gem 'rspec', '~> 3.12'
@@ -17,7 +18,6 @@ group :test do
 end
 
 group :development do
-  gem 'upennlib-rubocop', require: false
   gem 'webrick', '~> 1.8'
   gem 'yard', '~> 0.9'
 end

data/README.md

@@ -53,6 +53,12 @@ To run rubocop with the configuration:
 rubocop
 ```
 
+#### To regenerate `.rubocop_todo.yml`:
+```shell
+bundle exec rubocop --auto-gen-config  --auto-gen-only-exclude --exclude-limit 10000
+```
+
+
 ### Testing
 
 Testing is done with `rspec`. Test coverage should approach 100% given the relative simplicity of this gem.
@@ -63,6 +69,12 @@ To run the test suite:
 rspec
 ```
 
+## Publishing the Gem
+
+1. Update the version in `pennmarc.gemspec`
+2. Run `gem build pennmarc.gemspec` with the latest code
+3. Run `gem push pennmarc-{version number here}`(e.g. `gem push pennmarc-1.0.0`) to push to RubyGems. You will need access and MFA setup with RubyGems.
+
 ## QA
 
 ### Checking output of an arbitrary MARC XML file
@@ -75,8 +87,6 @@ MARC_FILE=path/to/marc.xml bundle exec rake pennmarc:parse
 
 ## TODO
  - rake task or some similar command to return a full set of values extracted from a specified marcxml file
- - hosting of yard output files?
- - mappings (locations, call number, languages)
  - Pipeline to run tests and publish to Rubygems
     - rubocop check
     - rdoc/yard coverage checks?

data/lib/pennmarc/helpers/creator.rb

@@ -24,43 +24,45 @@ module PennMARC
       #       indicator1 tell us the order of the name?
       # @note ported from get_author_creator_1_search_values
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array<String>] array of author/creator values for indexing
-      def search(record, relator_mapping)
+      def search(record, relator_map: Mappers.relator)
+        creator_subfields = %w[a 1 4 6 8]
         acc = record.fields(TAGS).map do |field|
           pieces = field.filter_map do |sf|
             if sf.code == 'a'
               convert_name_order(sf.value)
-            elsif %w[a 1 4 6 8].exclude?(sf.code)
+            elsif creator_subfields.exclude?(sf.code)
               sf.value
             elsif sf.code == '4'
-              relator = translate_relator(sf.value, relator_mapping)
+              relator = translate_relator(sf.value, relator_map)
               next if relator.blank?
 
               relator
             end
           end
           value = join_and_squish(pieces)
-          if value.end_with?('.') || value.end_with?('-')
+          if value.end_with?('.', '-')
             value
           else
             "#{value}."
           end
         end
         # a second iteration over the same fields produces name entries with the names not reordered
+        secondary_subfields = %w[4 6 8]
         acc += record.fields(TAGS).map do |field|
           pieces = field.filter_map do |sf|
-            if !%w[4 6 8].member?(sf.code)
+            if secondary_subfields.exclude?(sf.code)
               sf.value
             elsif sf.code == '4'
-              relator = translate_relator(sf.value, relator_mapping)
+              relator = translate_relator(sf.value, relator_map)
               next if relator.blank?
 
               relator
             end
           end
           value = join_and_squish(pieces)
-          if value.end_with?('.') || value.end_with?('-')
+          if value.end_with?('.', '-')
             value
           else
             "#{value}."
@@ -69,9 +71,9 @@ module PennMARC
         acc += record.fields(%w[880]).filter_map do |field|
           next unless field.any? { |sf| sf.code == '6' && sf.value.in?(%w[100 110]) }
 
-          suba = field.find_all(&subfield_in?(%w[a])).map do |sf|
+          suba = field.find_all(&subfield_in?(%w[a])).map { |sf|
             convert_name_order(sf.value)
-          end.first
+          }.first
           oth = join_and_squish(field.find_all(&subfield_not_in?(%w[6 8 a t])).map(&:value))
           join_and_squish [suba, oth]
         end
@@ -88,11 +90,11 @@ module PennMARC
       # All author/creator values for display (like #show, but multivalued?) - no 880 linkage
       # @note ported from get_author_creator_values (indexed as author_creator_a) - shown on results page
       # @param [MARC::Record] record
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [Array<String>] array of author/creator values for display
-      def values(record, relator_mapping)
+      def values(record, relator_map: Mappers.relator)
         record.fields(TAGS).map do |field|
-          name_from_main_entry(field, relator_mapping)
+          name_from_main_entry(field, relator_map)
         end
       end
 
@@ -109,8 +111,7 @@ module PennMARC
         end
       end
 
-      # Author/Creator sort. Does not map and include any relator
-      # codes.
+      # Author/Creator sort. Does not map and include any relator codes.
       # @todo This includes any URI from ǂ0 which could help to disambiguate in sorts, but ǂ1 is excluded...
       # @note ported from get_author_creator_sort_values
       # @param [MARC::Record] record
@@ -135,7 +136,7 @@ module PennMARC
         }
         source_map.flat_map do |field_num, subfields|
           record.fields(field_num.to_s).map do |field|
-            trim_punctuation(join_subfields(field, &subfield_in?(subfields.split(''))))
+            trim_punctuation(join_subfields(field, &subfield_in?(subfields.chars)))
           end
         end
       end
@@ -145,7 +146,7 @@ module PennMARC
       # @param [MARC::Record] record
       # @param [Hash] relator_map
       # @return [Array<String>] array of conference values
-      def conference_show(record, relator_map)
+      def conference_show(record, relator_map: Mappers.relator)
         record.fields('111').filter_map do |field|
           name_from_main_entry field, relator_map
         end
@@ -183,6 +184,42 @@ module PennMARC
       # @note see get_conference_search_values
       def conference_search(record); end
 
+      # Retrieve contributor values for display from fields {https://www.oclc.org/bibformats/en/7xx/700.html 700}
+      # and {https://www.oclc.org/bibformats/en/7xx/710.html 710} and their linked alternates. Joins subfields
+      # 'a', 'b', 'c', 'd', 'j', and 'q'. Then appends resulting string with joined subfields 'e', 'u', '3', and '4'.
+      # @note legacy version returns array of hash objects including data for display link
+      # @param [MARC::Record] record
+      # @ param [Hash] relator_map
+      # @return [Array<String>]
+      def contributor_show(record, relator_map: Mappers.relator)
+        indicator_2_options = ['', ' ', '0']
+        contributors = record.fields(%w[700 710]).filter_map do |field|
+          next unless indicator_2_options.member?(field.indicator2)
+          next if subfield_defined? field, 'i'
+
+          contributor = join_subfields(field, &subfield_in?(%w[a b c d j q]))
+          contributor_append_subfields = %w[e u 3 4]
+          contributor_append = field.filter_map { |subfield|
+            next unless contributor_append_subfields.member?(subfield.code)
+
+            if subfield.code == '4'
+              ", #{translate_relator(subfield.value, relator_map)}"
+            else
+              " #{subfield.value}"
+            end
+          }.join
+          "#{contributor} #{contributor_append}".squish
+        end
+        contributors + record.fields('880').filter_map do |field|
+          next unless subfield_value_in?(field, '6', %w[700 710])
+          next if subfield_defined?(field, 'i')
+
+          contributor = join_subfields(field, &subfield_in?(%w[a b c d j q]))
+          contributor_append = join_subfields(field, &subfield_in?(%w[e u 3]))
+          "#{contributor} #{contributor_append}".squish
+        end
+      end
+
       private
 
       # Trim punctuation method extracted from Traject macro, to ensure consistent output
@@ -209,8 +246,9 @@ module PennMARC
       # @param [MARC::Field] field
       # @return [String] joined subfield values for value from field
       def name_from_main_entry(field, mapping)
-        s = field.filter_map do |sf|
-          if %w[0 1 4 6 8].exclude?(sf.code)
+        name_subfields = %w[0 1 4 6 8]
+        s = field.filter_map { |sf|
+          if name_subfields.exclude?(sf.code)
             " #{sf.value}"
           elsif sf.code == '4'
             relator = translate_relator(sf.value, mapping)
@@ -218,8 +256,8 @@ module PennMARC
 
             ", #{relator}"
           end
-        end.join
-        (s + (!%w[. -].member?(s.last) ? '.' : '')).squish
+        }.join
+        (s + (%w[. -].member?(s.last) ? '' : '.')).squish
       end
 
       # Convert "Lastname, First" to "First Lastname"

data/lib/pennmarc/helpers/database.rb

@@ -21,7 +21,7 @@ module PennMARC
       def type(record)
         record.fields('944').filter_map do |field|
           # skip unless specified database format type present
-          next unless subfield_value?(field, 'a', /#{DATABASES_FACET_VALUE}/)
+          next unless subfield_value?(field, 'a', /#{DATABASES_FACET_VALUE}/o)
 
           type = field.find { |subfield| subfield.code == 'b' }
           type&.value
@@ -39,7 +39,7 @@ module PennMARC
 
         record.fields('943').filter_map do |field|
           # skip unless Community of Interest code is in subfield '2'
-          next unless subfield_value?(field, '2', /#{COI_CODE}/)
+          next unless subfield_value?(field, '2', /#{COI_CODE}/o)
 
           category = field.find { |subfield| subfield.code == 'a' }
           category&.value
@@ -60,17 +60,17 @@ module PennMARC
 
         record.fields('943').filter_map do |field|
           # skip unless Community of Interest code is in subfield '2'
-          next unless subfield_value?(field, '2', /#{COI_CODE}/)
+          next unless subfield_value?(field, '2', /#{COI_CODE}/o)
 
           category = field.find { |subfield| subfield.code == 'a' }
 
-          # skip unless category is present
-          next unless category.present?
+          # skip if category is blank
+          next if category.blank?
 
           subcategory = field.find { |subfield| subfield.code == 'b' }
 
-          # skip unless subcategory is present
-          next unless subcategory.present?
+          # skip if subcategory is blank
+          next if subcategory.blank?
 
           "#{category.value}--#{subcategory.value}"
         end
@@ -82,7 +82,7 @@ module PennMARC
       # @param [Marc::Record]
       # @return [TrueClass, FalseClass]
       def curated_db?(record)
-        record.fields('944').any? { |field| subfield_value?(field, 'a', /#{DATABASES_FACET_VALUE}/) }
+        record.fields('944').any? { |field| subfield_value?(field, 'a', /#{DATABASES_FACET_VALUE}/o) }
       end
     end
   end

data/lib/pennmarc/helpers/date.rb

@@ -10,13 +10,13 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [DateTime, nil] The publication date, or nil if date found in record is invalid
       def publication(record)
-        record.fields('008').filter_map do |field|
+        record.fields('008').filter_map { |field|
           four_digit_year = sanitize_partially_known_date(field.value[7, 4], '0')
 
-          next unless four_digit_year.present?
+          next if four_digit_year.blank?
 
           DateTime.new(four_digit_year.to_i)
-        end.first
+        }.first
       end
 
       # Retrieve date added (subfield 'q') from enriched marc 'itm' field.
@@ -24,7 +24,7 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [DateTime, nil] The date added, or nil if date found in record is invalid
       def added(record)
-        record.fields(EnrichedMarc::TAG_ITEM).flat_map do |field|
+        record.fields(EnrichedMarc::TAG_ITEM).flat_map { |field|
           field.filter_map do |subfield|
             # skip unless field has date created subfield
             next unless subfield_defined?(field, EnrichedMarc::SUB_ITEM_DATE_CREATED)
@@ -42,7 +42,7 @@ module PennMARC
             puts "Error parsing date in date added subfield: #{subfield.value} - #{e}"
             nil
           end
-        end.max
+        }.max
       end
 
       # Retrieve date last updated from {https://www.loc.gov/marc/bibliographic/bd005.html 005 field}.
@@ -51,19 +51,20 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [DateTime, nil] The date last updated, or nil if date found in record is invalid
       def last_updated(record)
-        record.fields('005').filter_map do |field|
-          date_time_string = field.value
+        record.fields('005').filter_map { |field|
+          begin
+            date_time_string = field.value
 
-          next if date_time_string.blank?
+            next if date_time_string.blank?
 
-          next if date_time_string.start_with?('0000')
+            next if date_time_string.start_with?('0000')
 
-          DateTime.iso8601(date_time_string).to_datetime
-
-        rescue ArgumentError => e
-          puts "Error parsing last updated date: #{date_time_string} - #{e}"
-          nil
-        end.first
+            DateTime.iso8601(date_time_string).to_datetime
+          rescue ArgumentError => e
+            puts "Error parsing last updated date: #{date_time_string} - #{e}"
+            nil
+          end
+        }.first
       end
 
       private

data/lib/pennmarc/helpers/edition.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module PennMARC
-  # Do Edition-y stuff
+  # Do Edition and edition-related field processing.
   class Edition < Helper
     class << self
       # Edition values for display on a record page. Field 250 is information relating to the edition of a work as
@@ -14,9 +14,9 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>] array of editions and their alternates
       def show(record)
-        record.fields('250').map do |field|
+        record.fields('250').map { |field|
           join_subfields(field, &subfield_not_in?(%w[6 8]))
-        end + linked_alternate_not_6_or_8(record, '250')
+        } + linked_alternate_not_6_or_8(record, '250')
       end
 
       # Edition values for display in search results. Just grab the first 250 field.
@@ -24,7 +24,7 @@ module PennMARC
       # @return [String, NilClass] string of all first 250 subfields, excluding 6 and 8
       def values(record)
         edition = record.fields('250').first
-        return unless edition.present?
+        return if edition.blank?
 
         join_subfields(edition, &subfield_not_in?(%w[6 8]))
       end
@@ -34,17 +34,19 @@ module PennMARC
       # display.
       # https://www.loc.gov/marc/bibliographic/bd775.html
       # @param [MARC::Record] record
+      # @param [Hash] relator_map
       # @return [Array<String>] array of other edition strings
-      def other_show(record, relator_mapping)
-        record.fields('775').filter_map do |field|
+      def other_show(record, relator_map: Mappers.relator)
+        values = record.fields('775').filter_map do |field|
           next unless subfield_defined?(field, :i)
 
-          other_edition_value(field, relator_mapping)
-        end + record.fields('880').filter_map do |field|
+          other_edition_value(field, relator_map)
+        end
+        values + record.fields('880').filter_map do |field|
           next unless field.indicator2.blank? && subfield_value_in?(field, '6', %w[775]) &&
                       subfield_defined?(field, 'i')
 
-          other_edition_value(field, relator_mapping)
+          other_edition_value(field, relator_map)
         end
       end
 
@@ -52,31 +54,34 @@ module PennMARC
 
       # Assemble a string of relevant edition information.
       # @param [MARC::DataField] field
-      # @param [Hash] relator_mapping
+      # @param [Hash] relator_map
       # @return [String (frozen)] assembled other version string
-      def other_edition_value(field, relator_mapping)
+      def other_edition_value(field, relator_map)
         subi = remove_paren_value_from_subfield_i(field) || ''
-        other_editions = field.filter_map do |sf|
-          next if %w[6 8].member?(sf.code)
+        excluded_subfields = %w[6 8]
+        other_edition_subfields = %w[s x z]
+        other_editions = field.filter_map { |sf|
+          next if excluded_subfields.member?(sf.code)
 
-          if %w[s x z].member?(sf.code)
+          if other_edition_subfields.member?(sf.code)
             " #{sf.value}"
           elsif sf.code == 't'
-            relator = translate_relator(sf.value, relator_mapping)
+            relator = translate_relator(sf.value, relator_map)
             next if relator.blank?
 
             " #{relator}. "
           end
-        end.join
-        other_editions_append = field.filter_map do |sf|
-          next if %w[6 8].member?(sf.code)
+        }.join
+        other_editions_append_subfields = %w[i h s t x z e f o r w y 7]
+        other_editions_append = field.filter_map { |sf|
+          next if excluded_subfields.member?(sf.code)
 
-          if %w[i h s t x z e f o r w y 7].exclude?(sf.code)
+          if other_editions_append_subfields.exclude?(sf.code)
             " #{sf.value}"
           elsif sf.code == 'h'
             " (#{sf.value}) "
           end
-        end.join
+        }.join
         prepend = trim_trailing(:period, subi).squish
 
         if other_editions.present? || other_editions_append.present?

data/lib/pennmarc/helpers/format.rb

@@ -71,7 +71,7 @@ module PennMARC
       # @param [Hash] location_map
       # @return [Array<String>] format values for faceting
 
-      def facet(record, location_map)
+      def facet(record, location_map: Mappers.location)
         formats = []
         format_code = leader_format(record.leader)
         f007 = record.fields('007').map(&:value)
@@ -88,7 +88,8 @@ module PennMARC
         end
 
         # get all specific_location values from inventory info
-        locations = Location.location record: record, location_map: location_map, display_value: :specific_location
+        locations = Location.location record: record, location_map: location_map,
+                                      display_value: :specific_location
 
         if include_manuscripts?(locations)
           formats << MANUSCRIPT
@@ -147,6 +148,16 @@ module PennMARC
         end
       end
 
+      # Retrieve cartographic reference data for map/atlas formats for display from
+      # {https://www.oclc.org/bibformats/en/2xx/255.html 255} and {https://www.oclc.org/bibformats/en/3xx/342.html 342}
+      # @param [MARC::Record] record
+      # @return [Array<String>]
+      def cartographic_show(record)
+        record.fields(%w[255 342]).map do |field|
+          join_subfields(field, &subfield_not_in?(%w[6 8]))
+        end
+      end
+
       # Check if a set of locations has any locations that include the term 'manuscripts'
       # @param [Array<String>] locations
       # @return [Boolean]
@@ -162,12 +173,12 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array]
       def curated_format(record)
-        record.fields('944').filter_map do |field|
+        record.fields('944').filter_map { |field|
           subfield_a = field.find { |sf| sf.code == 'a' }
           next if subfield_a.nil? || (subfield_a.value == subfield_a.value.to_i.to_s)
 
           subfield_a.value
-        end.uniq
+        }.uniq
       end
 
       # @param [String] format_code