pennmarc 1.2.21 → 1.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0640cecffbc07d2fb4df6e838f2d243fca284b0229f8b12c14db0288162ffd70
-  data.tar.gz: 15b2e6729b4c1b10edb3d1ce0bfa59c879b31ece90273e180524dd5563b0a196
+  metadata.gz: b5f3095fc6bb6a688539dc03d57678dcfe48a4e50c86e2f304f24c95c2520c3e
+  data.tar.gz: 7549c5774d952dd35062ee36b039e4db6137cfdb90840453752d60b0f817a455
 SHA512:
-  metadata.gz: db6a48cc984b4d51330155b9404f85ab5ec4553a16d2bd2e26d2757c89c7171db9519b8dcb676df5f7ad79d2d1b6efd01c05945dcac64b071765526719367711
-  data.tar.gz: 7fef29c3213773182eceee2cbefac354a9886df959325d4ec6874303780d7ff275746f867b5987ae89f8f193ae5d8bd4f7f68e38d200df071a30639fac6c40b6
+  metadata.gz: 2aff101e41d22473fa7da490ab347c04487ad6a0ae2e7a35cd91dfb8a4ab7251d397b0c5dcbc6ab64920821407d357cbd7c5673b46dfd7ca00f02c173eff03f2
+  data.tar.gz: e21ff016f09df155db0eaee8aec6132a86696c8609bf65ffc8cad2a246dff29cdfdb44d49d9b574d33cd42876eeecd70c973a86610d52b39710953001b790951

data/lib/pennmarc/helpers/creator.rb

@@ -1,25 +1,27 @@
 # frozen_string_literal: true
 
 module PennMARC
-  # Do Creator & Author field processing. Main methods pull from 110 and 111 fields. Display methods here no longer
-  # return data structures intended for generating "search" links, but some of the split subfield parsing remains from
-  # ported methods in case we need to replicate that functionality.
+  # Do Creator & Author field processing. Main methods pull from 110 and 111 fields.
   # @todo can there ever be multiple 100 fields?
   #       can ǂe and ǂ4 both be used at the same time? seems to result in duplicate values
   class Creator < Helper
     # Main tags for Author/Creator information
     TAGS = %w[100 110].freeze
 
+    # For creator fields intended for display, these subfields are ignored
+    DISPLAY_EXCLUDED_SUBFIELDS = %w[a 0 1 4 5 6 8 t].freeze
+
+    # For creator fields intended for searching, these subfields are ignored
+    SEARCH_EXCLUDED_SUBFIELDS = %w[a 1 4 5 6 8 t].freeze
+
     # Aux tags for Author/Creator information, for use in search_aux method
     AUX_TAGS = %w[100 110 111 400 410 411 700 710 711 800 810 811].freeze
 
     CONFERENCE_SEARCH_TAGS = %w[111 711 811].freeze
     CORPORATE_SEARCH_TAGS = %w[110 710 810].freeze
 
-    # 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
+    CONTRIBUTOR_DISPLAY_SUBFIELDS = %w[a b c d j q u 3].freeze
 
     FACET_SOURCE_MAP = {
       100 => 'abcdjq', 110 => 'abcdjq', 111 => 'abcen',
@@ -28,14 +30,12 @@ module PennMARC
     }.freeze
 
     class << self
-      # Author/Creator search field. Includes all subfield values (even ǂ0 URIs) from
+      # Author/Creator search field, from tags
       # {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
-      # in ǂ4. To better handle name searches, returns names as both "First Last" and "Last, First" if a comma is found
-      # in ǂa. Also indexes any linked values in the 880.
-      # @todo are we including too many details here and gumming up our index? consider UIRs, relator labels, dates...
-      # @todo shouldn't indicator1 tell us the order of the name? do we not trust the indicator?
-      # @note ported from get_author_creator_1_search_values
+      # {https://www.oclc.org/bibformats/en/1xx/110.html 110 Main Entry--Corporate Name}. Includes subfield values
+      # except for those in the {DISPLAY_EXCLUDED_SUBFIELDS} constant. Maps any relator codes found in ǂ4. To better
+      # handle name searches, returns names as both "First Last" and "Last, First" if a comma is found in ǂa. Also
+      # indexes any linked values in the 880.
       # @param record [MARC::Record]
       # @param relator_map [Hash]
       # @return [Array<String>] array of author/creator values for indexing
@@ -49,18 +49,18 @@ module PennMARC
       # {https://www.loc.gov/marc/bibliographic/bd700.html MARC 700},
       # {https://www.loc.gov/marc/bibliographic/bd710.html MARC 710},
       # and {https://www.loc.gov/marc/bibliographic/bd711.html MARC 711}. The 800, 810 and 8111 tags are similar in
-      # theme to the 7xx fields but apply to serial records.
-      # @note ported from get_author_creator_2_search_values
+      # theme to the 7xx fields but apply to serial records. Includes all subfield values except those in the
+      # {SEARCH_EXCLUDED_SUBFIELDS} constant.
       # @param record [MARC::Record]
       # @return [Array<String>] array of extended author/creator values for indexing
       def search_aux(record, relator_map: Mappers.relator)
         name_search_values record: record, tags: AUX_TAGS, relator_map: relator_map
       end
 
-      # 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. First, joins subfields
-      # other than $0, $1, $4, $6, $8, $e, and w. Then, appends any encoded relators found in $4.
-      # If there are no valid encoded relators, uses the value found in $e.
+      # Retrieve creator values for display from fields {https://www.loc.gov/marc/bibliographic/bd100.html 100},
+      # {https://www.loc.gov/marc/bibliographic/bd110.html 110} and their linked alternates. First, join each subfield
+      # value except for those defined in the {DISPLAY_EXCLUDED_SUBFIELDS} constant. Then, appends any encoded relators
+      # found in $4. If there are no valid encoded relators, uses the value found in $e.
       # @param record [MARC::Record]
       # @return [Array<String>] array of author/creator values for display
       def show(record, relator_map: Mappers.relator)
@@ -91,13 +91,7 @@ module PennMARC
       # @param first_initial_only [Boolean] only use the first initial instead of first name
       # @return [Array<String>] names of the authors
       def authors_list(record, main_tags_only: false, first_initial_only: false)
-        tags = if main_tags_only
-                 TAGS
-               else
-                 TAGS + CONTRIBUTOR_TAGS
-               end
-
-        fields = record.fields(tags)
+        fields = record.fields(main_tags_only ? TAGS : TAGS + CONTRIBUTOR_TAGS)
         fields.filter_map { |field|
           if field['a'].present?
             name = trim_trailing(:comma, field['a'])
@@ -164,7 +158,7 @@ module PennMARC
         }.uniq
       end
 
-      # Author/Creator sort. Does not map and include any relator codes.
+      # Author/Creator sort. Does not map or 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 record [MARC::Record]
@@ -177,8 +171,6 @@ module PennMARC
       # Author/Creator for faceting. Grabs values from a plethora of fields, joins defined subfields, then trims some
       # punctuation (@see Util.trim_punctuation)
       # @todo should trim_punctuation apply to each subfield value, or the joined values? i think the joined values
-      # @note ported from author_creator_xfacet2_input - is this the best choice? check the copyField declarations -
-      #       franklin uses author_creator_f
       # @param record [MARC::Record]
       # @return [Array<String>] array of author/creator values for faceting
       def facet(record)
@@ -267,7 +259,7 @@ 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', 'u', and '3'. Then appends resulting string with any encoded relationships
+      # defined in {CONTRIBUTOR_DISPLAY_SUBFIELDS}, 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
       # @param record [MARC::Record]
@@ -281,7 +273,7 @@ module PennMARC
         if vernacular
           fields += record.fields('880').select { |f| subfield_value?(f, '6', /^(#{CONTRIBUTOR_TAGS.join('|')})/) }
         end
-        sf = name_only ? %w[a] : %w[a b c d j q u 3]
+        sf = name_only ? %w[a] : CONTRIBUTOR_DISPLAY_SUBFIELDS
         fields.filter_map { |field|
           next if indicator_2_options.exclude?(field.indicator2) && field.tag.in?(CONTRIBUTOR_TAGS)
           next if subfield_defined? field, 'i'
@@ -299,11 +291,11 @@ module PennMARC
       # @return [Array<String>] name values from given tags
       def name_search_values(record:, tags:, relator_map:)
         acc = record.fields(tags).filter_map do |field|
-          name_from_main_entry field, relator_map, should_convert_name_order: false
+          name_from_main_entry field, relator_map, should_convert_name_order: false, for_display: false
         end
 
         acc += record.fields(tags).filter_map do |field|
-          name_from_main_entry field, relator_map, should_convert_name_order: true
+          name_from_main_entry field, relator_map, should_convert_name_order: true, for_display: false
         end
 
         acc += record.fields(['880']).filter_map do |field|
@@ -323,15 +315,17 @@ module PennMARC
       # @param field [MARC::Field]
       # @param mapping [Hash]
       # @param should_convert_name_order [Boolean]
+      # @param for_display [Boolean]
       # @return [String] joined subfield values for value from field
-      def name_from_main_entry(field, mapping, should_convert_name_order: false)
+      def name_from_main_entry(field, mapping, should_convert_name_order: false, for_display: true)
+        subfield_exclude_spec = for_display ? DISPLAY_EXCLUDED_SUBFIELDS : SEARCH_EXCLUDED_SUBFIELDS
         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) : trim_trailing(:comma, sf.value)
           elsif sf.code == relator_term_sf
             next
-          elsif NAME_EXCLUDED_SUBFIELDS.exclude?(sf.code)
+          elsif subfield_exclude_spec.exclude?(sf.code)
             sf.value
           end
         }.join(' ')
@@ -341,6 +335,8 @@ module PennMARC
                                           relator_term_sf: relator_term_sf,
                                           relator_map: mapping)
 
+        return name_and_relator unless for_display
+
         name_and_relator + (%w[. -].member?(name_and_relator.last) ? '' : '.')
       end
 

data/lib/pennmarc/version.rb

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

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

@@ -52,8 +52,8 @@ describe 'PennMARC::Creator' do
       it 'contains the expected search_aux field values for a single author work' do
         expect(helper.search_aux(record, relator_map: mapping)).to contain_exactly(
           'Author Fancy active 24th century AD, Author.',
-          'Author, Added.',
-          'Added Author.',
+          'Author, Added',
+          'Added Author',
           'Alt Author Alt Fanciness',
           'Alt Added Author'
         )
@@ -328,7 +328,7 @@ describe 'PennMARC::Creator' do
   describe '.conference_show' do
     let(:record) do
       marc_record fields: [
-        marc_field(tag: '111', subfields: { a: 'MARC History Symposium', '4': 'aut' }),
+        marc_field(tag: '111', subfields: { a: 'MARC History Symposium', '0': 'http://cool.uri/12345', '4': 'aut' }),
         marc_field(tag: '880', subfields: { a: 'Alt. MARC History Symposium', '6': '111' })
       ]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.2.21
+  version: 1.2.22
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-05 00:00:00.000000000 Z
+date: 2025-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport