cocina-models 0.110.0 → 0.110.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b9fe9682c10921ac206fea73e6526883ba31fe7fb08f720f17ff7601e54e0d4
-  data.tar.gz: c854536af0b5c26c355129317c6331ae0ff9c772edc666a03a1f68cde97c0c8e
+  metadata.gz: 9ba030653ba2790a20c4d071881472d3889bb4739c3c4637bb68d11d4c320207
+  data.tar.gz: 1f5d68d708a345aaf833908dca817af1c5c8499723d7f5194e2b0097817cb3a5
 SHA512:
-  metadata.gz: cfe6d191ba1e17e102788fca888c4bd5e099eca554bd38e3642b155b453c26d4cba11f1dbc2b1e02547fe8d682a5382224eb0650d7c6be8dc3abb1636e968f25
-  data.tar.gz: adb832be7b97215ff35647f94fa20bc86eab92d7045a52e7e81d3274b935fc8156b11c250b0fd9079ac3d0197b266e628693a138aec84ba962791df720a6f79d
+  metadata.gz: 796ab6c265801899f9b31ff131313d413133fbaf2829e2899dd0535a616345af723201d76aca3cecd4e9efaab5c2afa3151a5281a32cfb3adb46ece694378a13
+  data.tar.gz: 6ef1fc9300e553734fe55bc59b2cee35d80020e80b6539990ceb81d9c6f809e48449995fe6d0173ac9cf1d2a46d1aa264bfd86afa0c587999b7ae927590e84f9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.110.0)
+    cocina-models (0.110.1)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -211,7 +211,7 @@ CHECKSUMS
   attr_extras (7.1.0) sha256=d96fc9a9dd5d85ba2d37762440a816f840093959ae26bb90da994c2d9f1fc827
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
-  cocina-models (0.110.0)
+  cocina-models (0.110.1)
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0

data/lib/cocina/models/mapping/from_marc/contributor.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'marc_relators'
-
 module Cocina
   module Models
     module Mapping

data/lib/cocina/models/mapping/from_marc/description_builder.rb

@@ -17,7 +17,7 @@ module Cocina
             form: Form,
             identifier: Identifier,
             adminMetadata: AdminMetadata,
-            # relatedResource: RelatedResource,
+            relatedResource: RelatedResource,
             geographic: Geographic,
             access: Access
           }.freeze

data/lib/cocina/models/mapping/from_marc/event.rb

@@ -19,19 +19,15 @@ module Cocina
 
           # @return [Array<Hash>] an array of event hashes
           def build
-            linked_264_field = Util.linked_field(marc, marc['264']) if marc['264']
             [
               publication_from008,
               publication(marc['260']),
               manufacture(marc['260']),
-
               production(marc['264']),
-              production(linked_264_field),
-
               edition_statement(marc['250']),
               frequency_statement(marc['310']),
               mode_of_issuance(marc['334'])
-            ].compact
+            ].flatten.compact
           end
 
           MARC_264_INDICATOR2 = {
@@ -69,6 +65,13 @@ module Cocina
           def production(field)
             return unless field
 
+            fields = [build_production(field)]
+            alt_script_field = Util.linked_field(marc, field)
+            fields << build_production(alt_script_field) if alt_script_field
+            fields
+          end
+
+          def build_production(field)
             indicator = MARC_264_INDICATOR2.fetch(field.indicator2)
             return copyright(field) if indicator[:type] == 'copyright notice'
 
@@ -95,6 +98,13 @@ module Cocina
           def edition_statement(field)
             return unless field
 
+            fields = [build_edition_statement(field)]
+            alt_script_field = Util.linked_field(marc, field)
+            fields << build_edition_statement(alt_script_field) if alt_script_field
+            fields
+          end
+
+          def build_edition_statement(field)
             statement = field.subfields.select { %w[a b].include? it.code }.map(&:value).join(' ')
             { type: 'publication', note: [{ value: statement, type: 'edition' }]}
           end
@@ -116,13 +126,20 @@ module Cocina
           def publication(field)
             return unless field
 
-            publication_place = field.subfields.find { it.code == 'a' }&.value
+            fields = [build_publication(field)]
+            alt_script_field = Util.linked_field(marc, field)
+            fields << build_publication(alt_script_field) if alt_script_field
+            fields
+          end
+
+          def build_publication(field)
+            publication_places = field.subfields.filter_map { Util.strip_punctuation(it.value) if it.code == 'a' }
             publisher = field.subfields.find { it.code == 'b' }&.value
             publication_date = field.subfields.find { it.code == 'c' }.value.delete_suffix('.')
 
             {
               type: 'publication',
-              place: [{ value: Util.strip_punctuation(publication_place) }],
+              place: publication_places.map { { value: it } },
               contributor: [{ name: [{ value: Util.strip_punctuation(publisher) }], role: [{ value: 'publisher' }] }],
               date: [{ value: publication_date, type: 'publication' }]
             }
@@ -133,9 +150,9 @@ module Cocina
 
             manufacture_place = field.subfields.find { |subfield| subfield.code == 'e' }&.value
             manufacturer = field.subfields.find { |subfield| subfield.code == 'f' }&.value
-            manufacture_date = field.subfields.find { |subfield| subfield.code == 'g' }&.value
             return nil unless manufacture_place || manufacturer
 
+            manufacture_date = field.subfields.find { |subfield| subfield.code == 'g' }&.value
             {
               type: 'manufacture',
               place: [{ value: Util.strip_punctuation(manufacture_place) }],

data/lib/cocina/models/mapping/from_marc/note.rb

@@ -37,7 +37,7 @@ module Cocina
             '530' => { codes: %w[a b c d u 3], type: 'additional physical form' },
             '532' => %w[a 3],
             '533' => { codes: %w[a b c d e f m n y 3], type: 'reproduction' },
-            '534' => %w[3 a b c e f k l m n o p t x z 3],
+            '534' => %w[a b c e f k l m n o p t x z 3],
             '535' => { codes: %w[3 a b c d g], type: 'original location' },
             '536' => { codes: %w[a b c d e f g h], type: 'funding' },
             '538' => { codes: ['a'], type: 'system details' },
@@ -50,18 +50,18 @@ module Cocina
             '547' => ['a'],
             '550' => ['a'],
             '552' => %w[a b c d e f g h i j k l m n o p u z],
-            '555' => %w[3 a b c d u 3],
+            '555' => %w[a b c d u 3],
             '556' => %w[a z],
             '561' => { codes: %w[a u 3], type: 'ownership' },
-            '562' => { codes: %w[3 a b c d e 3], type: 'version identification' },
+            '562' => { codes: %w[a b c d e 3], type: 'version identification' },
             '563' => { codes: %w[a u 3], type: 'binding' },
             '565' => %w[a b c d e 3],
             '567' => %w[a b],
             '580' => ['a'],
             '581' => { codes: %w[a z 3], type: 'publications' },
-            '583' => { codes: %w[3 a b c d e f h i j k l n o u z 3], type: 'action' },
+            '583' => { codes: %w[a b c d e f h i j k l n o u z 3], type: 'action' },
             '584' => %w[3 a b 3],
-            '585' => { codes: %w[3 a 3], type: 'exhibitions' },
+            '585' => { codes: %w[a 3], type: 'exhibitions' },
             '586' => %w[a 3],
             '588' => ['a'],
             '590' => ['a'],

data/lib/cocina/models/mapping/from_marc/related_resource.rb

@@ -0,0 +1,169 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    module Mapping
+      module FromMarc
+        # Maps relatedResource information from MARC records to Cocina models.
+        class RelatedResource # rubocop:disable Metrics/ClassLength
+          # @see #initialize
+          # @see #build
+          def self.build(...)
+            new(...).build
+          end
+
+          # @param [MARC::Record] marc MARC record from FOLIO
+          def initialize(marc:)
+            @marc = marc
+          end
+
+          # @return [Array<Hash>] an array of relatedResource hashes
+          def build
+            [
+              in_series(marc['490']),
+              marc.fields.select { it.tag == '700' }.map { has_part(it) }.compact,
+              marc.fields.select { it.tag == '700' }.map { related_title(it) }.compact,
+              has_part_corporate(marc['710']),
+              related_to_meeting(marc['711'])
+            ].flatten.compact_blank
+          end
+
+          private
+
+          def in_series(field)
+            return unless field
+
+            { type: 'in series', title: [field['3'], field['a'], field['v'], field['l'], field['x']].join(' ') }
+          end
+
+          def has_part(field) # rubocop:disable Naming/PredicatePrefix
+            return unless field && field.indicator2 == '2' && field['t']
+
+            contributor = if field.indicator1 == '3'
+                            family_contributor(field)
+                          else
+                            person_contributor(field)
+                          end
+
+            body_has_part(field, contributor)
+          end
+
+          def has_part_corporate(field) # rubocop:disable Naming/PredicatePrefix
+            return unless field && field.indicator2 == '2' && field['t']
+
+            contributor = corporate_contributor(field)
+            body_has_part(field, contributor)
+          end
+
+          def body_has_part(field, contributor)
+            {
+              type: 'has part',
+              displayLabel: field['i'],
+              title: [
+                {
+                  value: [field['t'], field['f'], field['g'], field['k'], field['l'], field['m'], field['n'], field['p'], field['o'], field['r'], field['s']].compact.join(' ')
+                }
+              ],
+              contributor: [contributor]
+            }
+          end
+
+          def related_title(field)
+            return unless field && field.indicator2 != '2' && field['t']
+
+            linked = Util.linked_field(marc, field)
+            vals = [build_related_title(field)]
+            vals << build_related_title(linked) if linked
+            vals
+          end
+
+          def build_related_title(field)
+            contributor = if field.indicator1 == '3'
+                            family_contributor(field)
+                          else
+                            person_contributor(field)
+                          end
+            body_related_to(field, contributor)
+          end
+
+          def related_to_meeting(field)
+            return unless field && field.indicator2 != '2' && field['t']
+
+            contributor = meeting_contributor(field)
+            body_related_to(field, contributor)
+          end
+
+          def body_related_to(field, contributor)
+            {
+              type: 'related to',
+              displayLabel: field['i'],
+              title: [
+                {
+                  value: [field['t'], field['f'], field['g'], field['k'], field['l'], field['m'], field['n'], field['p'], field['o'], field['r'], field['s']].compact.join(' ')
+                }
+              ],
+              contributor: [
+                contributor
+              ]
+            }.compact
+          end
+
+          def person_contributor(field)
+            name = field.subfields.filter_map { it.value if %w[a b c d j q].include?(it.code) }.join(' ').delete_suffix(',')
+            {
+              type: 'person',
+
+              name: [{ value: name }],
+              affiliation: [{ value: field['u'] }.compact].compact_blank,
+              role: [{ value: field['e']&.delete_suffix('.') }.compact].compact_blank,
+              identifier: [{ uri: field['1'] }.compact].compact_blank
+            }.compact_blank
+          end
+
+          def family_contributor(field)
+            {
+              type: 'family',
+              name: [
+                {
+                  value: [field['a'], field['b'], field['c'], field['d'], field['j'], field['q']].compact.join(' ').delete_suffix(',')
+                }
+              ],
+              affiliation: [{ value: field['u'] }.compact].compact_blank,
+              role: [{ value: field['e']&.delete_suffix('.') }.compact].compact_blank,
+              identifier: [{ uri: field['1'] }.compact].compact_blank
+            }.compact_blank
+          end
+
+          def corporate_contributor(field)
+            {
+              type: 'organization',
+              name: [
+                {
+                  value: [field['a'], field['b'], field['c'], field['d']].compact.join(' ').delete_suffix(',')
+                }
+              ],
+              role: [{ value: field['e']&.delete_suffix('.') }.compact].compact_blank,
+              identifier: [{ uri: field['1'] }.compact].compact_blank
+            }.compact_blank
+          end
+
+          def meeting_contributor(field)
+            {
+              type: 'organization',
+              name: [
+                {
+                  value: [field['a'], field['b'], field['c'], field['d'], field['e'], field['q']].compact.join(' ').delete_suffix(',')
+                }
+              ],
+              affiliation: [{ value: field['u'] }.compact].compact_blank,
+              role: [{ value: field['j']&.delete_suffix('.') }.compact].compact_blank,
+              identifier: [{ uri: field['1'] }.compact].compact_blank
+            }.compact_blank
+          end
+
+          attr_reader :marc
+        end
+      end
+    end
+  end
+end

data/lib/cocina/models/mapping/from_marc/util.rb

@@ -13,12 +13,16 @@ module Cocina
             value.gsub(regex, '')
           end
 
+          # Parse a MARC 880$6
+          # See https://www.loc.gov/marc/bibliographic/ecbdcntf.html
           def self.linked_field(marc, field)
             pointer = field.subfields.find { |subfield| subfield.code == '6' }
             return unless pointer
 
-            field_id, index = pointer.value.split('-')
-            marc.fields(field_id)[index.to_i - 1]
+            # Subfield $6 is formatted thusly:
+            #  $6 [linking tag]-[occurrence number]/[script identification code]/[field orientation code]
+            linking_tag, occurrence_number = pointer.value.split(%r{-|/})
+            marc.fields(linking_tag)[occurrence_number.to_i - 1]
           end
         end
       end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.110.0'
+    VERSION = '0.110.1'
   end
 end

data/lib/cocina/models.rb

@@ -23,6 +23,7 @@ class CocinaModelsInflector < Zeitwerk::Inflector
     'dro_structural' => 'DROStructural',
     'dro_with_metadata' => 'DROWithMetadata',
     'libraries_doi' => 'LibrariesDOI',
+    'marc_relators' => 'MARC_RELATORS',
     'preregistered_repository_doi' => 'PreregisteredRepositoryDOI',
     'repository_doi' => 'RepositoryDOI',
     'request_dro' => 'RequestDRO',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.110.0
+  version: 0.110.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -431,6 +431,7 @@ files:
 - lib/cocina/models/mapping/from_marc/language.rb
 - lib/cocina/models/mapping/from_marc/marc_relators.rb
 - lib/cocina/models/mapping/from_marc/note.rb
+- lib/cocina/models/mapping/from_marc/related_resource.rb
 - lib/cocina/models/mapping/from_marc/title.rb
 - lib/cocina/models/mapping/from_marc/util.rb
 - lib/cocina/models/mapping/from_mods/access.rb