pennmarc 1.0.18 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f6b5628a407dc533c2f41b5c93d4b47239a36cc106c873b5bc7768825959451
-  data.tar.gz: 55db336dac7987be256abfec2830d72e9fc599346e49c2cc92c0cf61f7c810ff
+  metadata.gz: 5cec796509d9822289de751b33395fa6de1c1c23fdbdf78de54de11152674733
+  data.tar.gz: 9a2aa7d1ca7c7bd27627fac7f676492100eb36cb823469fd5b7e987244795cee
 SHA512:
-  metadata.gz: 4e2c930016793ae39d206d55a574c3e26d329507f6be46cde19628bcf6f9cc55213fcc9e8c7866e3f031510261fbba1cd64e54fe429c1bb92f0cb9c9c03dc9f8
-  data.tar.gz: 2162e68b8aa887239e36333a9c1650a3f989cc1906b0c4271e419c4ad21a20e8cf2a19455fa3e77b8dbbf9bf4cdf4b9fdf6f99b6cfb61d68050d7362ae8867e3
+  metadata.gz: 2076675bbbc9bc38f3c36ba0932211ee4726d618de8d3781cae5d314576162b13bd256918910e534b638cd601a5f0e2db0936c7e8fd7fb58f1788ef1f28552d2
+  data.tar.gz: d963b043b08eff3567d904b18d938cddd3edc7a8d5238c720203cce52657cc86f6f20445e3d1c0de7221c628822990c87ea4cb0a2191b33b49992f8d6fa87ac9

data/lib/pennmarc/helpers/creator.rb

@@ -19,6 +19,8 @@ module PennMARC
       # subfields NOT to join when combining raw subfield values
       NAME_EXCLUDED_SUBFIELDS = %w[a 1 4 5 6 8 t].freeze
 
+      CONTRIBUTOR_TAGS = %w[700 710].freeze
+
       # Author/Creator search field. Includes all subfield values (even ǂ0 URIs) from
       # {https://www.oclc.org/bibformats/en/1xx/100.html 100 Main Entry--Personal Name} and
       # {https://www.oclc.org/bibformats/en/1xx/110.html 110 Main Entry--Corporate Name}. Maps any relator codes found
@@ -48,27 +50,29 @@ module PennMARC
         name_search_values record: record, tags: AUX_TAGS, relator_map: relator_map
       end
 
-      # 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
+      # Retrieve creator values for display from fields {https://www.loc.gov/marc/bibliographic/bd100.html 100}
+      # and {https://www.loc.gov/marc/bibliographic/bd110.html 110} and their linked alternates. Appends any encoded
+      # relationships found in $4. If there are no valid encoded relationships, uses the value found in $e.
       # @param [MARC::Record] record
-      # @param [Hash] relator_map
       # @return [Array<String>] array of author/creator values for display
-      def values(record, relator_map: Mappers.relator)
-        record.fields(TAGS).map do |field|
-          name_from_main_entry(field, relator_map)
-        end
+      def show(record, relator_map: Mappers.relator)
+        fields = record.fields(TAGS)
+        fields += record.fields('880').select { |field| subfield_value?(field, '6', /^(#{TAGS.join('|')})/) }
+        fields.filter_map { |field|
+          creator = join_subfields(field, &subfield_not_in?(%w[0 1 4 6 8 e w]))
+          append_relator(field: field, joined_subfields: creator, relator_term_sf: 'e', relator_map: relator_map)
+        }.uniq
       end
 
-      # Author/Creator values for display
-      # @todo ported from get_author_display - used on record show page. porting did not include 4, e or w values,
-      #       which were part of the link object as 'append' values in franklin
+      # All author/creator values for display (like #show, but multivalued?) - no 880 linkage
+      # Performs additional normalization of author names
+      # @note ported from get_author_creator_values (indexed as author_creator_a) - shown on results page
       # @param [MARC::Record] record
+      # @param [Hash] relator_map
       # @return [Array<String>] array of author/creator values for display
-      def show(record)
-        fields = record.fields(TAGS)
-        fields += record.fields('880').select { |field| subfield_value_in?(field, '6', TAGS) }
-        fields.filter_map { |field|
-          join_subfields(field, &subfield_not_in?(%w[0 1 4 6 8 e w]))
+      def show_aux(record, relator_map: Mappers.relator)
+        record.fields(TAGS).map { |field|
+          name_from_main_entry(field, relator_map)
         }.uniq
       end
 
@@ -118,8 +122,8 @@ module PennMARC
       # @todo what is ǂi for?
       # @param [MARC::Record] record
       # @return [Array<String>] array of conference values
-      def conference_detail_show(record)
-        values = record.fields(%w[111 711]).filter_map do |field|
+      def conference_detail_show(record, relator_map: Mappers.relator)
+        conferences = record.fields(%w[111 711]).filter_map do |field|
           next unless field.indicator2.in? ['', ' ']
 
           conf = if subfield_undefined? field, 'i'
@@ -127,17 +131,21 @@ module PennMARC
                  else
                    ''
                  end
-          conf_extra = join_subfields field, &subfield_in?(%w[e j w])
-          join_and_squish [conf, conf_extra].compact_blank
+          sub_unit = join_subfields(field, &subfield_in?(%w[e w]))
+          conf = [conf, sub_unit].compact_blank.join(' ')
+
+          append_relator(field: field, joined_subfields: conf, relator_term_sf: 'j', relator_map: relator_map)
         end
-        conferences = values + record.fields('880').filter_map do |field|
-          next unless subfield_value_in? field, '6', %w[111 711]
+        conferences += record.fields('880').filter_map do |field|
+          next unless subfield_value? field, '6', /^(111|711)/
 
           next if subfield_defined? field, 'i'
 
           conf = join_subfields(field, &subfield_not_in?(%w[0 4 5 6 8 e j w]))
-          conf_extra = join_subfields(field, &subfield_in?(%w[4 e j w]))
-          join_and_squish [conf, conf_extra]
+          sub_unit = join_subfields(field, &subfield_in?(%w[e w]))
+          conf = [conf, sub_unit].compact_blank.join(' ')
+
+          append_relator(field: field, joined_subfields: conf, relator_term_sf: 'j', relator_map: relator_map)
         end
         conferences.uniq
       end
@@ -153,39 +161,24 @@ module PennMARC
 
       # 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'.
+      # 'a', 'b', 'c', 'd', 'j', and 'q', 'u', and '3'. Then appends resulting string with any encoded relationships
+      # found in $4. If there are no valid encoded relationships, uses the value found in $e.
       # @note legacy version returns array of hash objects including data for display link
+      # @todo is it okay to include 880 $4 here? Legacy includes $4 in main author display 880 but not here.
       # @param [MARC::Record] record
       # @ param [Hash] relator_map
       # @return [Array<String>]
       def contributor_show(record, relator_map: Mappers.relator)
         indicator_2_options = ['', ' ', '0']
-        values = record.fields(%w[700 710]).filter_map do |field|
-          next unless indicator_2_options.member?(field.indicator2)
+        fields = record.fields(CONTRIBUTOR_TAGS)
+        fields += record.fields('880').select { |f| subfield_value?(f, '6', /^(#{CONTRIBUTOR_TAGS.join('|')})/) }
+        fields.filter_map { |field|
+          next if indicator_2_options.exclude?(field.indicator2) && field.tag.in?(CONTRIBUTOR_TAGS)
           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 = values + 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
-        contributors.uniq
+          contributor = join_subfields(field, &subfield_in?(%w[a b c d j q u 3]))
+          append_relator(field: field, joined_subfields: contributor, relator_term_sf: 'e', relator_map: relator_map)
+        }.uniq
       end
 
       private
@@ -204,7 +197,7 @@ module PennMARC
         end
 
         acc += record.fields(['880']).filter_map do |field|
-          next unless field.any? { |sf| sf.code == '6' && sf.value.in?(tags) }
+          next unless subfield_value?(field, '6', /^(#{tags.join('|')})/)
 
           suba = field.find_all(&subfield_in?(%w[a])).filter_map { |sf|
             convert_name_order(sf.value)
@@ -242,19 +235,23 @@ module PennMARC
       # @param [Boolean] should_convert_name_order
       # @return [String] joined subfield values for value from field
       def name_from_main_entry(field, mapping, should_convert_name_order: false)
-        s = field.filter_map { |sf|
+        relator_term_sf = relator_term_subfield(field)
+        name = field.filter_map { |sf|
           if sf.code == 'a'
             should_convert_name_order ? convert_name_order(sf.value) : sf.value
+          elsif sf.code == relator_term_sf
+            next
           elsif NAME_EXCLUDED_SUBFIELDS.exclude?(sf.code)
-            " #{sf.value}"
-          elsif sf.code == '4'
-            relator = translate_relator(sf.value, mapping)
-            next if relator.blank?
-
-            ", #{relator}"
+            sf.value
           end
-        }.join
-        (s + (%w[. -].member?(s.last) ? '' : '.')).squish
+        }.join(' ')
+
+        name_and_relator = append_relator(field: field,
+                                          joined_subfields: name,
+                                          relator_term_sf: relator_term_sf,
+                                          relator_map: mapping)
+
+        name_and_relator + (%w[. -].member?(name_and_relator.last) ? '' : '.')
       end
 
       # Convert "Lastname, First" to "First Lastname"

data/lib/pennmarc/helpers/edition.rb

@@ -44,7 +44,7 @@ module PennMARC
           other_edition_value(field, relator_map)
         end
         editions = values + record.fields('880').filter_map do |field|
-          next unless field.indicator2.blank? && subfield_value_in?(field, '6', %w[775]) &&
+          next unless field.indicator2.blank? && subfield_value?(field, '6', /^775/) &&
                       subfield_defined?(field, 'i')
 
           other_edition_value(field, relator_map)

data/lib/pennmarc/helpers/format.rb

@@ -26,6 +26,9 @@ module PennMARC
       VIDEO = 'Video'
       WEBSITE_DATABASE = 'Website/Database'
 
+      # Values encoded in MARC that we use to determine "Archive" format
+      ARCHIVE_LOCATIONS = %w[archarch musearch scfreed univarch archivcoll].freeze
+
       # Get any Format values from {https://www.oclc.org/bibformats/en/3xx/300.html 300},
       # 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.
@@ -40,7 +43,7 @@ module PennMARC
         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])
+          next unless subfield_value?(f, '6', /^(254|255|300|310|340|342|352|362)/)
 
           subfield_to_ignore = if subfield_value?(f, 6, /^300/)
                                  %w[3 6 8]
@@ -74,7 +77,7 @@ module PennMARC
       # @param [Hash] location_map
       # @return [Array<String>] format values for faceting
 
-      def facet(record, location_map: Mappers.location)
+      def facet(record)
         formats = []
         format_code = leader_format(record.leader)
         f007 = record.fields('007').map(&:value)
@@ -83,49 +86,29 @@ module PennMARC
         title_medium = subfield_values_for tag: '245', subfield: :h, record: record
         media_type = subfield_values_for tag: '337', subfield: :a, record: record
 
-        # get all specific_location values from inventory info
-        locations = Location.location record: record, location_map: location_map,
-                                      display_value: :specific_location
-
-        if include_manuscripts?(locations)
-          formats << MANUSCRIPT
-        elsif archives_but_not_cajs_or_nursing?(locations)
-          formats << ARCHIVE
-        elsif micro_or_microform?(call_nums(record), locations, media_type, title_medium)
-          formats << MICROFORMAT
-        else
-          # any of these
-          formats << THESIS_DISSERTATION if thesis_or_dissertation?(format_code, record)
-          formats << CONFERENCE_EVENT if conference_event?(record)
-          formats << NEWSPAPER if newspaper?(f008, format_code)
-          formats << GOVDOC if government_document?(f008, record, format_code)
-
-          # but only one of these
-          formats << if website_database?(f006_forms, format_code)
-                       WEBSITE_DATABASE
-                     elsif book?(format_code, title_medium, record)
-                       BOOK
-                     elsif musical_score?(format_code)
-                       MUSICAL_SCORE
-                     elsif map_atlas?(format_code)
-                       MAP_ATLAS
-                     elsif graphical_media?(format_code)
-                       graphical_media_type(f007)
-                     elsif sound_recording?(format_code)
-                       SOUND_RECORDING
-                     elsif image?(format_code)
-                       IMAGE
-                     elsif datafile?(format_code)
-                       DATAFILE
-                     elsif journal_periodical?(format_code)
-                       JOURNAL_PERIODICAL
-                     elsif three_d_object?(format_code)
-                       THREE_D_OBJECT
-                     else
-                       OTHER
-                     end
-        end
-        formats.concat(curated_format(record)).uniq
+        # any of these
+        formats << MANUSCRIPT if include_manuscripts?(format_code)
+        formats << ARCHIVE if archive?(record)
+        formats << MICROFORMAT if micro_or_microform?(call_nums(record), f007, f008, media_type, title_medium)
+        formats << THESIS_DISSERTATION if thesis_or_dissertation?(format_code, record)
+        formats << CONFERENCE_EVENT if conference_event?(record)
+        formats << NEWSPAPER if newspaper?(f008, format_code)
+        formats << GOVDOC if government_document?(f008, record, format_code)
+        formats << WEBSITE_DATABASE if website_database?(f006_forms, format_code)
+        formats << BOOK if book?(format_code, media_type, record)
+        formats << MUSICAL_SCORE if musical_score?(format_code)
+        formats << MAP_ATLAS if map_atlas?(format_code)
+        formats << graphical_media_type(f007) if graphical_media?(format_code)
+        formats << SOUND_RECORDING if sound_recording?(format_code)
+        formats << IMAGE if image?(format_code)
+        formats << DATAFILE if datafile?(format_code)
+        formats << JOURNAL_PERIODICAL if journal_periodical?(format_code)
+        formats << THREE_D_OBJECT if three_d_object?(format_code)
+        formats.concat(curated_format(record))
+
+        formats << OTHER if formats.empty?
+
+        formats.uniq
       end
 
       # Show "Other Format" values from {https://www.oclc.org/bibformats/en/7xx/776.html 776} and any 880 linkage.
@@ -155,11 +138,11 @@ module PennMARC
         }.uniq
       end
 
-      # Check if a set of locations has any locations that include the term 'manuscripts'
-      # @param [Array<String>] locations
+      # Check if leader format code is either 't', 'f', or 'd'
+      # @param [String] format_code
       # @return [Boolean]
-      def include_manuscripts?(locations)
-        locations.any? { |loc| loc =~ /manuscripts/i }
+      def include_manuscripts?(format_code)
+        format_code.first.in? %w[t f d]
       end
 
       private
@@ -242,18 +225,18 @@ module PennMARC
       # @param [String] format_code
       # @return [Boolean]
       def musical_score?(format_code)
-        format_code.in?(%w[ca cb cd cm cs dm])
+        format_code.in?(%w[ca cb cc cd cm cs dc dm])
       end
 
       # @param [String] format_code
-      # @param [Array<String>] title_medium
+      # @param [Array<String>] media_type
       # @param [MARC::Record] record
       # @return [Boolean]
-      def book?(format_code, title_medium, record)
+      def book?(format_code, media_type, record)
         title_forms = subfield_values_for tag: '245', subfield: :k, record: record
         format_code.in?(%w[aa ac am tm]) &&
           title_forms.none? { |v| v =~ /kit/i } &&
-          title_medium.none? { |v| v =~ /micro/i }
+          media_type.none? { |val| val =~ /micro/i }
       end
 
       # @param [Array<String>] f006_forms
@@ -293,29 +276,38 @@ module PennMARC
       # @param [String] format_code
       # @return [Boolean]
       def thesis_or_dissertation?(format_code, record)
-        record.fields('502').any? && format_code == 'tm'
+        record.fields('502').any? && format_code.in?(%w[am tm dm])
       end
 
+      # @param [Array<String>] call_nums
+      # @param [Array<String>] f007
+      # @param [String] f008
       # @param [Array<String>] title_medium
       # @param [Array<String>] media_type
-      # @param [Array<String>] locations
-      # @param [Array<String>] call_nums
       # @return [Boolean]
-      def micro_or_microform?(call_nums, locations, media_type, title_medium)
-        locations.any? { |loc| loc =~ /micro/i } ||
+      def micro_or_microform?(call_nums, f007, f008, media_type, title_medium)
+        [f008[23], f008[29]].any? { |v| v.in?(%w[a b c]) } ||
+          f007.any? { |v| v.start_with?('h') } ||
           title_medium.any? { |val| val =~ /micro/i } ||
           call_nums.any? { |val| val =~ /micro/i } ||
-          media_type.any? { |val| val =~ /microform/i }
+          media_type.any? { |val| val =~ /micro/i }
       end
 
-      # @todo "cajs" has no match in our location map, so it is not doing anything. Does this intend to catch cjsambx
-      #       "Library at the Katz Center - Archives"?
-      # @param [Array<String>] locations
+      # Determine archive format by checking if {https://www.loc.gov/marc/bibliographic/hd852.html 852} and
+      # {PennMARC::Enriched} Publishing Tag 'ITM' have values that match any of the following archive locations:
+      # archarch, musearch, scfreed, univarch, archivcoll
+      # @param [MARC::Record] record
       # @return [Boolean]
-      def archives_but_not_cajs_or_nursing?(locations)
-        locations.any? { |loc| loc =~ /archives/i } &&
-          locations.none? { |loc| loc =~ /cajs/i } &&
-          locations.none? { |loc| loc =~ /nursing/i }
+      def archive?(record)
+        enriched_tag = Enriched::Pub::ITEM_TAG
+        enriched_sf = Enriched::Pub::ITEM_CURRENT_LOCATION
+
+        record.fields([enriched_tag, '852']).each do |field|
+          return true if field.tag == enriched_tag && subfield_value_in?(field, enriched_sf, ARCHIVE_LOCATIONS)
+
+          return true if field.tag == '852' && subfield_value_in?(field, 'c', ARCHIVE_LOCATIONS)
+        end
+        false
       end
 
       # Consider {https://www.loc.gov/marc/bibliographic/bd007g.html 007} to determine graphical media format

data/lib/pennmarc/helpers/genre.rb

@@ -32,7 +32,7 @@ module PennMARC
         record.fields(%w[655 880]).filter_map { |field|
           next unless allowed_genre_field?(field)
 
-          next if field.tag == '880' && subfield_values(field, '6').exclude?('655')
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^655/)
 
           subfields = %w[a b]
           sub_with_hyphens = field.find_all(&subfield_not_in?(%w[0 2 5 6 8 c e w])).map { |sf|
@@ -47,12 +47,10 @@ module PennMARC
       # @todo the Genre facet in Franklin is pretty ugly. It could be cleaned up by limiting the subfields included
       #       here and cleaning up punctuation.
       # @param [MARC::Record] record
-      # @param [Hash] location_map
       # @return [Array<String>]
-      def facet(record, location_map: Mappers.location)
-        locations = Location.location record: record, location_map: location_map,
-                                      display_value: :specific_location
-        manuscript = Format.include_manuscripts?(locations)
+      def facet(record)
+        format_code = record.leader[6] || ' '
+        manuscript = Format.include_manuscripts?(format_code)
         video = record.fields('007').any? { |field| field.value.starts_with? 'v' }
         return [] unless manuscript || video
 

data/lib/pennmarc/helpers/identifier.rb

@@ -112,7 +112,7 @@ module PennMARC
       # @return [Array<string>]
       def publisher_number_show(record)
         record.fields(%w[024 028 880]).filter_map { |field|
-          next if field.tag == '880' && subfield_value_not_in?(field, '6', %w[024 028])
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^(024|028)/)
 
           # do not return doi values from 024 ǂ2
           if field.tag == '024' && subfield_value_in?(field, '2', %w[doi])

data/lib/pennmarc/helpers/note.rb

@@ -17,7 +17,7 @@ module PennMARC
       def notes_show(record)
         notes_fields = %w[500 502 504 515 518 525 533 540 550 580 586 588]
         record.fields(notes_fields + ['880']).filter_map { |field|
-          next if field.tag == '880' && subfield_value_not_in?(field, '6', notes_fields)
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^(#{notes_fields.join('|')})/)
 
           join_subfields(field, &subfield_not_in?(%w[5 6 8]))
         }.uniq
@@ -39,7 +39,7 @@ module PennMARC
         additional_fields = %w[562 563 585 590]
 
         notes = local_notes + record.fields(additional_fields + ['880']).filter_map do |field|
-          next if field.tag == '880' && subfield_value_not_in?(field, '6', additional_fields)
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^(#{additional_fields.join('|')})/)
 
           join_subfields(field, &subfield_not_in?(%w[5 6 8]))
         end
@@ -58,7 +58,7 @@ module PennMARC
 
           next unless field.indicator2.in?([' ', ''])
 
-          next if field.tag == '880' && subfield_value_not_in?(field, '6', %w[561])
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^561/)
 
           next if subfield_value?(field, 'a', /^Athenaeum copy: /)
 
@@ -74,7 +74,7 @@ module PennMARC
       # @return [Array<String>]
       def contents_show(record)
         record.fields(%w[505 880]).filter_map { |field|
-          next if field.tag == '880' && subfield_value_not_in?(field, '6', %w[505])
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^505/)
 
           join_subfields(field, &subfield_not_in?(%w[6 8])).split('--')
         }.flatten.uniq
@@ -144,22 +144,22 @@ module PennMARC
       # @return [Array<String>]
       def system_details_show(record)
         system_details_notes = record.fields(%w[538 880]).filter_map do |field|
-          next if field.tag == '880' && subfield_value_not_in?(field, '6', ['538'])
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^538/)
 
           sub3_and_other_subs(field, &subfield_in?(%w[a i u]))
         end
         system_details_notes += record.fields(%w[344 880]).filter_map do |field|
-          next if field.tag == '880' && subfield_value_not_in?(field, '6', ['344'])
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^344/)
 
           sub3_and_other_subs(field, &subfield_in?(%w[a b c d e f g h]))
         end
         system_details_notes += record.fields(%w[345 346 880]).filter_map do |field|
-          next if field.tag == '880' && subfield_value_not_in?(field, '6', %w[345 346])
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^(345|346)/)
 
           sub3_and_other_subs(field, &subfield_in?(%w[a b]))
         end
         system_details_notes += record.fields(%w[347 880]).filter_map do |field|
-          next if field.tag == '880' && subfield_value_not_in?(field, '6', ['347'])
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^347/)
 
           sub3_and_other_subs(field, &subfield_in?(%w[a b c d e f]))
         end

data/lib/pennmarc/helpers/production.rb

@@ -96,7 +96,7 @@ module PennMARC
       # @return [Array<String>]
       def place_of_publication_show(record)
         record.fields(%w[752 880]).filter_map { |field|
-          next if field.tag == '880' && subfield_values(field, '6').exclude?('752')
+          next if field.tag == '880' && no_subfield_value_matches?(field, '6', /^752/)
 
           place = join_subfields(field, &subfield_not_in?(%w[6 8 e w]))
           place_extra = join_subfields(field, &subfield_in?(%w[e w]))

data/lib/pennmarc/helpers/relation.rb

@@ -49,45 +49,46 @@ module PennMARC
       # @param [Hash] relator_map
       # @return [Array]
       def related_work_show(record, relator_map: Mappers.relator)
-        values = record.fields(RELATED_WORK_FIELDS).filter_map do |field|
+        fields = record.fields(RELATED_WORK_FIELDS)
+        fields += record.fields('880').select { |f| subfield_value?(f, '6', /^(#{RELATED_WORK_FIELDS.join('|')})/) }
+        fields.filter_map { |field|
           next if field.indicator2.present?
 
           next unless subfield_defined?(field, 't')
 
-          values_with_title_prefix(field, sf_exclude: %w[0 4 6 8 i], relator_map: relator_map)
-        end
-        relation_values = values + record.fields('880').filter_map do |field|
-          next if field.indicator2.present?
+          relator_term_sf = relator_term_subfield(field)
 
-          next unless subfield_value?(field, '6', /^(#{RELATED_WORK_FIELDS.join('|')})/)
-
-          next unless subfield_defined?(field, 't')
+          sf_exclude = %w[0 4 6 8 i] << relator_term_sf
 
-          values_with_title_prefix(field, sf_exclude: %w[0 4 6 8 i], relator_map: relator_map)
-        end
-        relation_values.uniq
+          values_with_title_prefix(field,
+                                   relator_term_sf: relator_term_sf,
+                                   relator_map: relator_map,
+                                   &subfield_not_in?(sf_exclude))
+        }.uniq
       end
 
       # Get "Contains" values from {CONTAINS_FIELDS} in the 7XX range. Must have indicator 2 value of 2 indicating an
       # "Analytical Entry" meaning that the record is contained by the matching field. Map relator codes in sf 4. Ignore
       # values in sf 0, 5, 6, and 8.
+      # @todo is it okay to include 880 $4 here? Legacy includes untranslated $4, why?
       # @param [MARC::Record] record
       # @param [Hash] relator_map
       # @return [Array<String>]
       def contains_show(record, relator_map: Mappers.relator)
-        values = record.fields(CONTAINS_FIELDS).filter_map do |field|
+        fields = record.fields(CONTAINS_FIELDS)
+        fields += record.fields('880').select { |f| subfield_value?(f, '6', /^(#{CONTAINS_FIELDS.join('|')})/) }
+        fields.filter_map { |field|
           next unless field.indicator2 == '2'
 
-          values_with_title_prefix(field, sf_exclude: %w[0 4 5 6 8 i], relator_map: relator_map)
-        end
-        contains_values = values + record.fields('880').filter_map do |field|
-          next unless field.indicator2 == '2'
+          relator_term_sf = relator_term_subfield(field)
 
-          next unless subfield_value?(field, '6', /^(#{CONTAINS_FIELDS.join('|')})/)
+          sf_exclude = %w[0 4 5 6 8 i] << relator_term_sf
 
-          values_with_title_prefix(field, sf_include: %w[0 5 6 8 i])
-        end
-        contains_values.uniq
+          values_with_title_prefix(field,
+                                   relator_term_sf: relator_term_sf,
+                                   relator_map: relator_map,
+                                   &subfield_not_in?(sf_exclude))
+        }.uniq
       end
 
       # Get "Constituent Unit" values from {https://www.oclc.org/bibformats/en/7xx/774.html MARC 774}. Include
@@ -114,24 +115,21 @@ module PennMARC
 
       # Handle common behavior when a relator field references a title in subfield i
       # @param [MARC::DataField] field
-      # @param [Array, nil] sf_include subfields to include, optional
-      # @param [Array, nil] sf_exclude subfields to exclude, optional
+      # @param [String, nil] relator_term_sf subfield that holds relator term
       # @param [Hash, nil] relator_map map relator in sf4 using this map, optional
+      # @param [Proc] join_selector
       # @return [String] extracted and processed values from field
-      def values_with_title_prefix(field, sf_include: nil, sf_exclude: nil, relator_map: nil)
-        raise ArgumentError('Define only sf_include or sf_exclude.') if sf_include.present? && sf_exclude.present?
-
+      def values_with_title_prefix(field, relator_term_sf: nil, relator_map: nil, &join_selector)
         subi = remove_paren_value_from_subfield_i(field) || ''
-        relator = translate_relator(subfield_values(field, '4').first, relator_map) if relator_map.present?
-        contains = if sf_include.present?
-                     join_subfields(field, &subfield_not_in?(sf_include))
-                   elsif sf_exclude.present?
-                     join_subfields(field, &subfield_not_in?(sf_exclude))
-                   end
-        [
-          subi,
-          [contains, relator].compact_blank.join(', ')
-        ].compact_blank.join(': ')
+
+        title = join_subfields(field, &join_selector)
+
+        title_with_relator = append_relator(field: field,
+                                            joined_subfields: title,
+                                            relator_term_sf: relator_term_sf,
+                                            relator_map: relator_map)
+
+        [subi, title_with_relator].compact_blank.join(': ')
       end
     end
   end