pennmarc 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b69f7173f51a48c0748bf1d537392c6bda0919312009c85bd70e603cf4cb0240
-  data.tar.gz: fa0e2d2c724e26734890fcc1fe4e20899a6141d0e0f0cdebe9e242b03070be35
+  metadata.gz: cb5991760f2f82ed299e5602451881e8b71a88fec9cae1f570afe8e5c90d56f9
+  data.tar.gz: d0fa00068ed63eb1ea9de2127f706c4076b56eb567ac29fc0e88c77a74b5605d
 SHA512:
-  metadata.gz: 4ed0b2699d095d4f07483e38fd99d8bcc52d2fd69f8c6b94dfba410a8d6f42329dda379e7eb8809ec43687d8552cc38471f85859ff0d73c0888026845caed1e6
-  data.tar.gz: 62d4f90ff259a2188fc0cc5eee803cd18e9f1a83d15874de77ef956e6dd836ae6a822a433770c0e56e2f583c15f696919be30f7298c080b4404d27e3f247d245
+  metadata.gz: edff4fba2a3e3edf56b7e7fb79992f595becf46e588fa81cb4ed327153deacc6a4bf2c8b040808830f5963e2c64db8a6165bfbdcb04698884ac5ebe4b997d4f0
+  data.tar.gz: f3024891d0d48b13e18b3d25ec09e33c134cb77a152bb3849079589b893f99eef9489b8a81307cab14d941467d36242f829c0a9120d42b24064e862c9411fe80

data/lib/pennmarc/helpers/creator.rb

@@ -313,6 +313,42 @@ module PennMARC
         }.uniq
       end
 
+      # Similar to contributor_show, excluding the authors included in extended_show
+      # @param record [MARC::Record]
+      # @param relator_map [Hash]
+      # @param name_only [Boolean]
+      # @param vernacular [Boolean]
+      # @return [Array<String>]
+      def contributor_noauthor_show(record, relator_map: Mappers.relator, name_only: false, vernacular: true)
+        contributor_fields = record.fields(CONTRIBUTOR_TAGS)
+
+        # Exclude the 700 authors and collect their linkages
+        excluded_linkages = []
+        filtered_fields = contributor_fields.reject do |f|
+          is_author = f.tag == '700' && (f['4']&.downcase == 'aut' || f['e']&.downcase&.start_with?('author'))
+          excluded_linkages << "700-#{f['6'].split('-').last}" if is_author && f['6']
+          is_author
+        end
+
+        # Add vernacular fields that are not excluded by checking the linkages
+        if vernacular
+          vernacular_fields = record.fields('880').select do |f|
+            CONTRIBUTOR_TAGS.any? { |tag| f['6']&.start_with?(tag) } && !excluded_linkages.include?(f['6'])
+          end
+          filtered_fields.concat(vernacular_fields)
+        end
+
+        sf = name_only ? %w[a] : CONTRIBUTOR_DISPLAY_SUBFIELDS
+
+        filtered_fields.filter_map { |field|
+          next if ['', ' ', '0'].exclude?(field.indicator2) && field.tag.in?(CONTRIBUTOR_TAGS)
+          next if subfield_defined? field, 'i'
+
+          contributor = join_subfields(field, &subfield_in?(sf))
+          append_relator(field: field, joined_subfields: contributor, relator_term_sf: 'e', relator_map: relator_map)
+        }.uniq
+      end
+
       private
 
       # @param record [MARC::Record]

data/lib/pennmarc/mappings/locations.yml

@@ -101,6 +101,10 @@ litaward:
   library: Athenaeum of Philadelphia
   display: Athenaeum of Philadelphia - Literary Award
   aeon: true
+lounge:
+  specific_location: Athenaeum of Philadelphia - Member Lounge
+  library: Athenaeum of Philadelphia
+  display: Athenaeum of Philadelphia - Member Lounge
 microfilm:
   specific_location: Athenaeum of Philadelphia - Microfilm
   library: Athenaeum of Philadelphia
@@ -970,12 +974,11 @@ newbofc:
     - 'Veterinary: du Pont Library (New Bolton)'
   display: 'Veterinary: du Pont Library (New Bolton) - Office'
 newbrare:
-  specific_location: Kislak Center for Special Collections - Fairman Rogers Collection
+  specific_location: LIBRA - Fairman Rogers Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - Fairman Rogers Coll.
+    - LIBRA
+  display: LIBRA - Fairman Rogers Collection
   aeon: true
 newbrefe:
   specific_location: 'Veterinary: du Pont Library (New Bolton) - Reference'
@@ -1085,20 +1088,18 @@ scg123:
   display: Kislak Center for Special Collections - Rare Book Collection 123
   aeon: true
 sc1100c:
-  specific_location: Kislak Center for Special Collections - 1100C Collection
+  specific_location: LIBRA - 1100C Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - 1100C Collection
+    - LIBRA
+  display: LIBRA - 1100C Collection
   aeon: true
 scadams:
-  specific_location: Kislak Center for Special Collections - Adams Collection
+  specific_location: LIBRA - Adams Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - Adams Collection
+    - LIBRA
+  display: LIBRA - Adams Collection
   aeon: true
 scartbk:
   specific_location: Kislak Center for Special Collections - Artists' Books
@@ -1117,12 +1118,11 @@ scbanks:
   display: Kislak Center for Special Collections - Joanna Banks Collection
   aeon: true
 scblank:
-  specific_location: Kislak Center for Special Collections - Blank Collection
+  specific_location: LIBRA - Blank Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - Blank Collection
+    - LIBRA
+  display: LIBRA - Blank Collection
   aeon: true
 scbyron:
   specific_location: Kislak Center for Special Collections - Byron Collection
@@ -1205,12 +1205,11 @@ scelz:
   display: Kislak Center for Special Collections - Elzevier Collection
   aeon: true
 scfast:
-  specific_location: Kislak Center for Special Collections - Fast Collection
+  specific_location: LIBRA - Fast Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - Fast Collection
+    - LIBRA
+  display: LIBRA - Fast Collection
   aeon: true
 scforr:
   specific_location: Kislak Center for Special Collections - Forrest Collection
@@ -1253,20 +1252,18 @@ scfurnlib:
   display: Kislak Center for Special Collections - Furness Shakespeare Library (Van
     Pelt 628)
 scfurnst:
-  specific_location: Kislak Center for Special Collections - Furness Collection
+  specific_location: LIBRA - Furness Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - Furness Storage
+    - LIBRA
+  display: LIBRA - Furness Storage
   aeon: true
 scgull:
-  specific_location: Kislak Center for Special Collections - Gulliver's Travels Collection
+  specific_location: LIBRA - Gulliver's Travels Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - Gulliver's Travels Collection
+    - LIBRA
+  display: LIBRA - Gulliver's Travels Collection
   aeon: true
 scinc:
   specific_location: Kislak Center for Special Collections - Incunables
@@ -1309,12 +1306,11 @@ scmss:
   display: Kislak Center for Special Collections - Manuscripts
   aeon: true
 scmst:
-  specific_location: Kislak Center for Special Collections - Manuscripts Storage
+  specific_location: LIBRA - Manuscripts Storage
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - Manuscripts Storage
+    - LIBRA
+  display: LIBRA - Manuscripts Storage
   aeon: true
 scmsw:
   specific_location: Kislak Center for Special Collections - Web
@@ -1367,12 +1363,11 @@ screfe:
   display: Kislak Center for Special Collections - Reference Collection
   aeon: true
 screfestor:
-  specific_location: Kislak Center for Special Collections - Reference Storage
+  specific_location: LIBRA - Reference Storage
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections Reference Storage
+    - LIBRA
+  display: LIBRA - Reference Storage
   aeon: true
 scschimmel:
   specific_location: Kislak Center for Special Collections - Schimmel Collection
@@ -1399,12 +1394,11 @@ scsmith:
   display: Kislak Center for Special Collections - E.F. Smith Collection
   aeon: true
 scsmithst:
-  specific_location: Kislak Center for Special Collections - E.F. Smith Collection
+  specific_location: LIBRA - E.F. Smith Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - E.F. Smith Collection Storage
+    - LIBRA
+  display: LIBRA - E.F. Smith Collection Storage
   aeon: true
 scsterne:
   specific_location: Kislak Center for Special Collections - Day Sterne Collection
@@ -1415,12 +1409,11 @@ scsterne:
   display: Kislak Center for Special Collections - Day Sterne Collection
   aeon: true
 scstor:
-  specific_location: Kislak Center for Special Collections - Rare Book Collection
+  specific_location: LIBRA - Rare Book Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - Rare Book Collection Storage
+    - LIBRA
+  display: LIBRA - Rare Book Collection Storage
   aeon: true
 scstorvil:
   specific_location: LIBRA Vilain-Wieck Collection
@@ -1649,6 +1642,13 @@ veteresov:
     - 'Veterinary: Atwood Library (Campus)'
     - Reserve
   display: 'Veterinary: Atwood Library (Campus) - Reserve Oversize'
+vetewellrm:
+  specific_location: 'Veterinary: Atwood Library (Campus)- Wellness Room'
+  library:
+    - Health Sciences Libraries
+    - Veterinary
+    - 'Veterinary: Atwood Library (Campus)'
+  display: 'Veterinary: Atwood Library (Campus)- Wellness Room'  
 vpexhibit:
   specific location: Van Pelt - Exhibits and Events
   library: Van Pelt-Dietrich Library Center

data/lib/pennmarc/version.rb

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

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

@@ -478,7 +478,7 @@ describe 'PennMARC::Creator' do
   describe '.contributor_show' do
     let(:record) { marc_record fields: fields }
 
-    context 'when idicator2 is "1"' do
+    context 'when indicator2 is "1"' do
       let(:fields) do
         [marc_field(tag: '700', subfields: { a: 'Ignore' }, indicator2: '1')]
       end
@@ -554,4 +554,184 @@ describe 'PennMARC::Creator' do
       end
     end
   end
+
+  describe '.contributor_noauthor_show' do
+    let(:record) { marc_record fields: fields }
+
+    context 'when indicator2 is "1"' do
+      let(:fields) do
+        [marc_field(tag: '700', subfields: { a: 'Ignore' }, indicator2: '1')]
+      end
+
+      it 'ignores the field' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping)
+        expect(values).to be_empty
+      end
+    end
+
+    context 'with subfield "i"' do
+      let(:fields) do
+        [
+          marc_field(tag: '700', subfields: { i: 'Ignore', e: 'author' }),
+          marc_field(tag: '880', subfields: { i: 'Ignore', '6': '700' })
+        ]
+      end
+
+      it 'ignores the field' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping)
+        expect(values).to be_empty
+      end
+    end
+
+    context 'with a single contributor and linked alternate' do
+      let(:fields) do
+        [
+          marc_field(tag: '700', subfields: { a: 'Name', b: 'I', c: 'laureate', d: '1968', e: 'author',
+                                              j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                              '4': 'aut' }),
+          marc_field(tag: '880', subfields: {  '6': '700', a: 'Alt Name', b: 'Alt num', c: 'Alt title',
+                                               d: 'Alt date', e: 'Alt relator', j: 'Alt qualifier',
+                                               q: 'Alt Fuller Name', u: 'Alt affiliation', '3': 'Alt material' })
+        ]
+      end
+
+      it 'returns the non-author contributor only' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping)
+        expect(values).to contain_exactly(
+          'Alt Name Alt num Alt title Alt date Alt qualifier Alt Fuller Name Alt affiliation Alt material, Alt relator.'
+        )
+      end
+
+      it 'returns the non-author contributor name only when called with name_only as true' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping, name_only: true)
+        expect(values).to contain_exactly 'Alt Name, Alt relator.'
+      end
+
+      it 'returns empty when called with vernacular as false' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping, vernacular: false)
+        expect(values).to be_empty
+      end
+    end
+
+    context 'with four contributors two of which are authors' do
+      let(:fields) do
+        [
+          marc_field(tag: '700', subfields: { a: '01 (Ignore)', b: 'I', c: 'laureate',
+                                              j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                              '4': 'aut', '6': '880-01' }),
+          marc_field(tag: '700', subfields: { a: '02 (Ignore)', d: '1968', e: 'author',
+                                              j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                              '6': '880-02' }),
+          marc_field(tag: '700', subfields: { a: '03 (Show)', b: 'J', c: 'laureate',
+                                              j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                              '4': 'edt', '6': '880-03' }),
+          marc_field(tag: '700', subfields: { a: '04 (Show)', d: '1968', e: 'editor',
+                                              j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                              '6': '880-04' })
+        ]
+      end
+
+      it 'returns two non-author contributors' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping)
+        expect(values).to contain_exactly(
+          '03 (Show) J laureate pseud Fuller Name affiliation materials',
+          '04 (Show) 1968 pseud Fuller Name affiliation materials, editor.'
+        )
+      end
+
+      it 'returns contributor name only when called with name_only as true' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping, name_only: true)
+        expect(values).to contain_exactly('03 (Show)', '04 (Show), editor.')
+      end
+
+      it 'returns contributor values without alternatives when called with vernacular as false' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping, vernacular: false)
+        expect(values).to contain_exactly(
+          '03 (Show) J laureate pseud Fuller Name affiliation materials',
+          '04 (Show) 1968 pseud Fuller Name affiliation materials, editor.'
+        )
+      end
+    end
+
+    context 'with four contributors having respective alternatives, two of the contributors are authors' do
+      let(:fields) do
+        [
+          marc_field(tag: '700', subfields: { a: '01 (Ignore)', b: 'I', c: 'laureate',
+                                              j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                              '4': 'aut', '6': '880-01' }),
+          marc_field(tag: '700', subfields: { a: '02 (Ignore)', d: '1968', e: 'author',
+                                              j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                              '6': '880-02' }),
+          marc_field(tag: '700', subfields: { a: '03 (Show)', b: 'J', c: 'laureate',
+                                              j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                              '4': 'edt', '6': '880-03' }),
+          marc_field(tag: '700', subfields: { a: '04 (Show)', d: '1968', e: 'editor',
+                                              j: 'pseud', q: 'Fuller Name', u: 'affiliation', '3': 'materials',
+                                              '6': '880-04' }),
+          marc_field(tag: '880', subfields: { a: 'Alt Name 01 (Ignore)', '6': '700-01', b: 'Alt num 01',
+                                              c: 'Alt title 01', d: 'Alt date 01', e: 'Alt relator 01',
+                                              j: 'Alt qualifier 01', q: 'Alt Fuller Name 01', u: 'Alt affiliation 01',
+                                              '3': 'Alt material 01' }),
+          marc_field(tag: '880', subfields: { a: 'Alt Name 02 (Ignore)', '6': '700-02', b: 'Alt num 02',
+                                              c: 'Alt title 02', d: 'Alt date 02', e: 'Alt relator 02',
+                                              j: 'Alt qualifier 02', q: 'Alt Fuller Name 02', u: 'Alt affiliation 02',
+                                              '3': 'Alt material 02' }),
+          marc_field(tag: '880', subfields: { a: 'Alt Name 03 (Show)', '6': '700-03', b: 'Alt num 03',
+                                              c: 'Alt title 03', d: 'Alt date 03', e: 'Alt relator 03',
+                                              j: 'Alt qualifier 03', q: 'Alt Fuller Name 03', u: 'Alt affiliation 03',
+                                              '3': 'Alt material 03' }),
+          marc_field(tag: '880', subfields: { a: 'Alt Name 04 (Show)', '6': '700-04', b: 'Alt num 04',
+                                              c: 'Alt title 04', d: 'Alt date 04', e: 'Alt relator 04',
+                                              j: 'Alt qualifier 04', q: 'Alt Fuller Name 04', u: 'Alt affiliation 04',
+                                              '3': 'Alt material 04' })
+        ]
+      end
+
+      it 'returns two non-author contributors with their alternatives' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping)
+        expect(values).to contain_exactly(
+          '03 (Show) J laureate pseud Fuller Name affiliation materials',
+          '04 (Show) 1968 pseud Fuller Name affiliation materials, editor.',
+          'Alt Name 03 (Show) Alt num 03 Alt title 03 Alt date 03 Alt qualifier 03 Alt Fuller Name 03 '\
+            'Alt affiliation 03 Alt material 03, Alt relator 03.',
+          'Alt Name 04 (Show) Alt num 04 Alt title 04 Alt date 04 Alt qualifier 04 Alt Fuller Name 04 '\
+            'Alt affiliation 04 Alt material 04, Alt relator 04.'
+        )
+      end
+
+      it 'returns two non-author contributors name and alternative names only when called with name_only as true' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping, name_only: true)
+        expect(values).to contain_exactly('03 (Show)', 'Alt Name 03 (Show), Alt relator 03.',
+                                          '04 (Show), editor.', 'Alt Name 04 (Show), Alt relator 04.')
+      end
+
+      it 'returns two non-author contributors without alternatives when called with vernacular as false' do
+        values = helper.contributor_noauthor_show(record, relator_map: mapping, vernacular: false)
+        expect(values).to contain_exactly(
+          '03 (Show) J laureate pseud Fuller Name affiliation materials',
+          '04 (Show) 1968 pseud Fuller Name affiliation materials, editor.'
+        )
+      end
+    end
+
+    context 'with a corporate contributor and linked alternate' do
+      let(:fields) do
+        [
+          marc_field(tag: '710', subfields: { a: 'Corporation', b: 'A division', c: 'Office', d: '1968', e: 'author',
+                                              u: 'affiliation', '3': 'materials', '4': 'aut' }),
+          marc_field(tag: '880', subfields: { '6': '710', a: 'Alt Corp Name', b: 'Alt unit', c: 'Alt location',
+                                              d: 'Alt date', e: ['Alt relator', 'another'], u: 'Alt Affiliation',
+                                              '3': 'Alt materials' })
+        ]
+      end
+
+      it 'returns expected contributor values' do
+        values = helper.contributor_noauthor_show(record)
+        expect(values).to contain_exactly(
+          'Corporation A division Office 1968 affiliation materials, Author.',
+          'Alt Corp Name Alt unit Alt location Alt date Alt Affiliation Alt materials, Alt relator, another.'
+        )
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-22 00:00:00.000000000 Z
+date: 2025-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport