cocina-models 0.80.0 → 0.81.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c78843bdc4b3ba3ec0ea9e2e8fa569fe7979de0e5d1a52fc4923103ed20de36
-  data.tar.gz: b3e317a0154e15973e9a0e57aab07d0d91702a97a31889963d4df2c26339a6d4
+  metadata.gz: 0d8392fadece0bb4ec12ed93e958c99abf04e29ad0a78c14ee8651ec8ecd1e37
+  data.tar.gz: db4a5de344bb53d98b2b71f725e8b1d1b9e0d5e0b28416989ad55f19df826376
 SHA512:
-  metadata.gz: 2fa6986b659b6474ed9ac476237c6da8ff75487bb5c7ab61b33a0226af95c44b22f14210524f258bd75bf826ea141dcc3bb88ce31e2a85b6f4590ec1ea353eec
-  data.tar.gz: e41c8c60d4eafe62b0f4025213f73aa7629284a0e5f73e93d7b356204d075635a3ea7da3af1aaf9557de487e1eee5236c3eec23a92a04d17fc71ecec14e50c48
+  metadata.gz: 4880e4eb86935116e0bec017926aeab5e5aa12d8792ee5066d0aeef5f514e6f13f63c8bc68c03035fdff2748f95aa7215f236384e109a8e532bd76e9677ae53c
+  data.tar.gz: 22154804ee4b103bdbd3aaaee449327bb4a6c9bc1dce9431a5311ed06c5e76039ccb420634d275f56d644a60ffa529bd9cb822f9c549be057f4972d791a34bf7

data/lib/cocina/models/builders/name_title_group_builder.rb

@@ -92,7 +92,6 @@ module Cocina
           # ignoring groupedValue
           slices.flatten
         end
-        # private_class_method :value_slices
 
         # for a given Hash (from a Cocina DescriptiveValue or Title or Name or ...)
         # result will be either

data/lib/cocina/models/mapping/from_mods/name_builder.rb

@@ -36,7 +36,7 @@ module Cocina
 
           def build_parallel
             names = {
-              parallelValue: name_elements.map { |name_node| build_parallel_name(name_node) },
+              parallelValue: build_parallel_values,
               type: type_for(name_elements.first['type']),
               status: name_elements.filter_map { |name_element| name_element['usage'] }.first
             }.compact
@@ -52,7 +52,7 @@ module Cocina
             }.compact.merge(common_lang_script(name_node))
 
             name_attrs = name_attrs.merge(common_name(name_node, name_attrs[:name], is_parallel: true))
-            name_parts = build_name_parts(name_node)
+            name_parts = build_name_parts(name_node, parallel: true)
             notifier.warn('Missing name/namePart element') if name_parts.all?(&:empty?)
             name_parts.each { |name_part| name_attrs = name_part.merge(name_attrs) }
             name_attrs.compact
@@ -106,7 +106,17 @@ module Cocina
             end.compact
           end
 
-          def build_name_parts(name_node)
+          def build_parallel_values
+            parallel_values = []
+            name_elements.each do |name_node|
+              parallel_values << build_parallel_name(name_node)
+              display_val = display_value(name_node)
+              parallel_values << display_val if display_val
+            end
+            parallel_values.compact
+          end
+
+          def build_name_parts(name_node, parallel: false)
             name_part_nodes = name_node.xpath('mods:namePart', mods: Description::DESC_METADATA_NS)
             alternative_name_nodes = name_node.xpath('mods:alternativeName', mods: Description::DESC_METADATA_NS)
 
@@ -116,23 +126,64 @@ module Cocina
               parts << { valueAt: name_node['xlink:href'] } if name_node['xlink:href']
               parts << common_authority(name_node) if name_node['valueURI']
             when 1
-              parts << build_name_part(name_node, name_part_nodes.first,
-                                       default_type: alternative_name_nodes.present?)
-                       .merge(common_authority(name_node)).merge(common_lang_script(name_node)).presence
+              name = build_simple_value_name(name_node, name_part_nodes.first, alternative_name_nodes, parallel)
+              parts << name.merge(common_authority(name_node)).merge(common_lang_script(name_node)).presence
             else
-              vals = name_part_nodes.filter_map do |name_part|
-                build_name_part(name_node, name_part, default_type: name_node['type'] != 'corporate').presence
-              end
-              parts << { structuredValue: vals }.merge(common_authority(name_node)).merge(common_lang_script(name_node))
+              name = build_structured_value_name(name_node, name_part_nodes)
+              parts << name.merge(common_authority(name_node)).merge(common_lang_script(name_node))
             end
 
             parts = build_alternative_name(alternative_name_nodes, parts) if alternative_name_nodes.present?
-
-            display_form = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS).first
-            parts << { value: display_form.text, type: 'display' } if display_form
             parts.compact
           end
 
+          def build_simple_value_name(name_node, name_part_node, alternative_name_nodes, parallel)
+            name_value_hash = build_name_part(name_node, name_part_node, default_type: alternative_name_nodes.present?)
+            display_form_node = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS).first
+            if display_form_node.present? && !parallel
+              cocina_contrib_name =
+                {
+                  parallelValue: [
+                    name_value_hash
+                  ]
+                }
+              add_display_parallel_value(name_node, cocina_contrib_name)
+            else
+              name_value_hash
+            end
+          end
+
+          def build_structured_value_name(name_node, name_part_nodes)
+            vals = name_part_nodes.filter_map { |name_part_node| build_name_part(name_node, name_part_node, default_type: name_node['type'] != 'corporate').presence }
+            display_form_node = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS).first
+            if display_form_node.present?
+              cocina_contrib_name =
+                {
+                  parallelValue: [
+                    { structuredValue: vals }
+                  ]
+                }
+              add_display_parallel_value(name_node, cocina_contrib_name)
+            else
+              { structuredValue: vals }
+            end
+          end
+
+          def add_display_parallel_value(name_node, cocina_contrib_name)
+            display_form = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS)&.text
+            return cocina_contrib_name if display_form.blank?
+
+            display_parallel_value = display_value(name_node)
+            cocina_contrib_name[:parallelValue] << display_parallel_value if display_parallel_value && cocina_contrib_name[:parallelValue].present?
+
+            cocina_contrib_name
+          end
+
+          def display_value(name_node)
+            display_form = name_node.xpath('mods:displayForm', mods: Description::DESC_METADATA_NS)&.text
+            { value: display_form, type: 'display' } if display_form.present?
+          end
+
           def build_name_part(name_node, name_part_node, default_type: true)
             if name_part_node.content.blank? && !name_part_node['xlink:href']
               notifier.warn('name/namePart missing value')

data/lib/cocina/models/mapping/to_mods/name_writer.rb

@@ -36,25 +36,11 @@ module Cocina
             if contributor.type == 'unspecified others'
               write_etal
             elsif contributor.name.present?
+              # Expect contributor to have a single value for name property
               contrib_name = contributor.name.first
-              parallel_values = contrib_name.parallelValue
-              if parallel_values.present?
-                altrepgroup_id = id_generator.next_altrepgroup
-                parallel_values.each do |parallel_contrib_name|
-                  Cocina::Models::Builders::NameTitleGroupBuilder.value_slices(parallel_contrib_name)&.each do |parallel_contrib_name_slice|
-                    if name_title_vals_index[parallel_contrib_name_slice]
-                      name_title_group = name_title_vals_index[parallel_contrib_name_slice]&.values&.first
-                      write_parallel_contributor(contributor, contrib_name, parallel_contrib_name,
-                                                 name_title_group, altrepgroup_id)
-                    else
-                      # TODO:  want a way to notify that we hit a problem - either notifier or HB error (issue #3751)
-                      #  OR validate for semantic correctness upon creation/update so we can't get here.
-                      #  notifier.warn("For contributor name '#{parallel_contrib_name_val}', no title matching '#{title_from_contrib}'")
-                      write_parallel_contributor(contributor, contrib_name, parallel_contrib_name, nil,
-                                                 altrepgroup_id)
-                    end
-                  end
-                end
+              parallel_name_values = contrib_name.parallelValue
+              if parallel_name_values.present?
+                write_contributor_with_parallel_names(parallel_name_values, contrib_name)
               else
                 write_contributor(contributor)
               end
@@ -105,7 +91,50 @@ module Cocina
             end
           end
 
-          def write_parallel_contributor(contributor, name, parallel_name, name_title_group, altrepgroup_id)
+          def write_contributor_with_parallel_names(parallel_name_values, contrib_name)
+            display_type_parallel_name = display_type_parallel_name(parallel_name_values)
+            if parallel_name_values.size == 1
+              contrib_name_value_slice = Cocina::Models::Builders::NameTitleGroupBuilder.value_slices(parallel_name_values.first)
+              name_title_group = name_title_vals_index[contrib_name_value_slice]&.values&.first
+              write_name_from_parallel(contributor, contributor.name.first, parallel_name_values, name_title_group, nil)
+            elsif parallel_name_values.size == 2 && display_type_parallel_name
+              contrib_name_value_slice = Cocina::Models::Builders::NameTitleGroupBuilder.value_slices(parallel_name_values.first)
+              name_title_group = name_title_vals_index[contrib_name_value_slice]&.values&.first
+              write_name_with_display_form(contributor, contributor.name.first, parallel_name_values, 0, name_title_group, nil)
+            else
+              write_multiple_parallel_contributors(parallel_name_values, contrib_name)
+            end
+          end
+
+          def write_multiple_parallel_contributors(parallel_name_values, contrib_name)
+            altrepgroup_id = id_generator.next_altrepgroup
+            parallel_name_values.each_with_index do |parallel_contrib_name, index|
+              display_name_present = parallel_name_values[index + 1].present? && parallel_name_values[index + 1].type == 'display'
+              Cocina::Models::Builders::NameTitleGroupBuilder.value_slices(parallel_contrib_name)&.each do |parallel_contrib_name_slice|
+                if name_title_vals_index[parallel_contrib_name_slice]
+                  name_title_group = name_title_vals_index[parallel_contrib_name_slice]&.values&.first
+                  if display_name_present
+                    # associate type 'display' with the previous value
+                    write_name_with_display_form(contributor, contrib_name, parallel_name_values, index, name_title_group, altrepgroup_id)
+                  else
+                    write_name_from_parallel(contributor, contrib_name, parallel_contrib_name, name_title_group, altrepgroup_id)
+                  end
+                elsif display_name_present
+                  # TODO:  want a way to notify that we hit a problem - either notifier or HB error (issue #3751)
+                  #  OR validate for semantic correctness upon creation/update so we can't get here.
+                  #  notifier.warn("For contributor name '#{parallel_contrib_name_slice}', no contrib matching")
+                  write_name_with_display_form(contributor, contrib_name, parallel_name_values, index, nil, altrepgroup_id)
+                elsif parallel_name_values[index].type == 'display'
+                  # we assume we included this as part of a previous name
+                  next
+                else
+                  write_name_from_parallel(contributor, contrib_name, parallel_contrib_name, nil, altrepgroup_id)
+                end
+              end
+            end
+          end
+
+          def write_name_from_parallel(contributor, name, parallel_name, name_title_group, altrepgroup_id)
             attributes = parallel_name_attributes(name, parallel_name, name_title_group, altrepgroup_id)
             type_attr = NAME_TYPE.fetch(contributor.type, name_title_group ? 'personal' : nil)
             attributes[:type] = type_attr if type_attr
@@ -121,6 +150,37 @@ module Cocina
             end
           end
 
+          # rubocop:disable Metrics/ParameterLists
+          def write_name_with_display_form(contributor, name, parallel_name_values, index, name_title_group, altrepgroup_id)
+            display_type_parallel_name = display_type_parallel_name(parallel_name_values)
+            parallel_name = parallel_name_values[index]
+            return if parallel_name.blank?
+
+            attributes = if altrepgroup_id.present?
+                           parallel_name_attributes(name, parallel_name, name_title_group, altrepgroup_id)
+                         else
+                           name_attributes(contributor, name, nil)
+                         end
+            type_attr = NAME_TYPE.fetch(contributor.type, name_title_group ? 'personal' : nil)
+            attributes[:type] = type_attr if type_attr
+            xml.name attributes do
+              if parallel_name.structuredValue.present?
+                write_structured(parallel_name)
+              else
+                write_basic(parallel_name)
+              end
+              write_display_form(display_type_parallel_name) if display_type_parallel_name.present?
+              write_identifier(contributor) if contributor.identifier.present?
+              write_note(contributor)
+              write_roles(contributor)
+            end
+          end
+          # rubocop:enable Metrics/ParameterLists
+
+          def display_type_parallel_name(parallel_name_values)
+            parallel_name_values.detect { |parallel_value| parallel_value.type == 'display' }
+          end
+
           def parallel_name_attributes(name, parallel_name, name_title_group, altrepgroup_id)
             {
               nameTitleGroup: name_title_group,

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.80.0'
+    VERSION = '0.81.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.81.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport