pennmarc 1.0.22 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9222d0bfd9ca8704ec91ef01d1e27ce90711506b648f2d0006fc2270dd6d82d
-  data.tar.gz: c250833003d00f8d2b12a6c8e4043d9eadcdaaa33bba8ae70468e3210cdb1780
+  metadata.gz: 59881d630f244bc6d8b76665df84f4b22297de2d51c44f5272df4226f4e27e75
+  data.tar.gz: 8d4e78c359dea40f482adc5b4deaa3fbb75bbe15a4fce5955ad48de054ce82c4
 SHA512:
-  metadata.gz: b9a1c42746b7d1448df78aad4528c1bf20731feeadc073e4937d0722bcfbed6ec42c104ae2d1241cf31830e6c7e50b0b6ab125140cf9d232511530a7b82861ef
-  data.tar.gz: c143ab4e9056f6a62a06a90d01938d70a6b7088704930e0dcf402c392954c08164a9821f39f35d03d07023393ca1d64844fa56d16522155ec55ca4a9a35fcf9b
+  metadata.gz: 4a3a43ff1cecadf978a8c50d59b382c2592925116cacd757f368ea0a698e9b370a94e74fd98e1a6a06a3b837ab0dbdce2efece991aaf3da4b53c74396a73ee2e
+  data.tar.gz: 7f5468f9891c9fe15003160fb4d5a6c04cd8291ead5e803f0652368376e1fd67381195a7bdffd7ea9a7aa996c071b75240405dd956c46d879753f6811eca1b0a

data/lib/pennmarc/helpers/creator.rb

@@ -21,6 +21,12 @@ module PennMARC
 
       CONTRIBUTOR_TAGS = %w[700 710].freeze
 
+      FACET_SOURCE_MAP = {
+        100 => 'abcdjq', 110 => 'abcdjq', 111 => 'abcen',
+        700 => 'abcdjq', 710 => 'abcdjq', 711 => 'abcen',
+        800 => 'abcdjq', 810 => 'abcdjq', 811 => 'abcen'
+      }.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
@@ -51,19 +57,33 @@ module PennMARC
       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. Appends any encoded
-      # relationships found in $4. If there are no valid encoded relationships, uses the value found in $e.
+      # 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.
       # @param [MARC::Record] record
       # @return [Array<String>] array of author/creator values for display
       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)
+          parse_show_value(field, relator_map: relator_map)
         }.uniq
       end
 
+      # Hash with main creator show values as the fields and the corresponding facet as the values.
+      # Does not include linked 880s.
+      # @param [MARC::Record] record
+      # @param [Hash] relator_map
+      # @return [Hash]
+      def show_facet_map(record, relator_map: Mappers.relator)
+        creators = record.fields(TAGS).filter_map do |field|
+          show = parse_show_value(field, relator_map: relator_map)
+          facet = parse_facet_value(field, FACET_SOURCE_MAP[field.tag.to_i].chars)
+          { show: show, facet: facet }
+        end
+        creators.to_h { |h| [h[:show], h[:facet]] }
+      end
+
       # 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
@@ -94,14 +114,9 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array<String>] array of author/creator values for faceting
       def facet(record)
-        source_map = {
-          100 => 'abcdjq', 110 => 'abcdjq', 111 => 'abcen',
-          700 => 'abcdjq', 710 => 'abcdjq', 711 => 'abcen',
-          800 => 'abcdjq', 810 => 'abcdjq', 811 => 'abcen'
-        }
-        source_map.flat_map { |field_num, subfields|
+        FACET_SOURCE_MAP.flat_map { |field_num, subfields|
           record.fields(field_num.to_s).map do |field|
-            trim_punctuation(join_subfields(field, &subfield_in?(subfields.chars)))
+            parse_facet_value(field, subfields.chars)
           end
         }.uniq
       end
@@ -117,7 +132,11 @@ module PennMARC
         }.uniq
       end
 
-      # Conference detailed display, intended for record show page.
+      # Conference detailed display, intended for record show page. Retrieve conference values for record display from
+      # {https://www.loc.gov/marc/bibliographic/bd111.html 111}, {https://www.loc.gov/marc/bibliographic/bd711.html 711}
+      # , and their linked 880s. If there is no $i, we join subfield $i we join subfield values other than
+      # $0, $4, $5, $6, $8, $e, $j, and $w. to create the conference value. We then join the conference subunit value
+      # using subfields $e and $w. We append any relators, preferring those defined in $4 and using $j as a fallback.
       # @note ported from get_conference_values
       # @todo what is ǂi for?
       # @param [MARC::Record] record
@@ -126,15 +145,7 @@ module PennMARC
         conferences = record.fields(%w[111 711]).filter_map do |field|
           next unless field.indicator2.in? ['', ' ']
 
-          conf = if subfield_undefined? field, 'i'
-                   join_subfields field, &subfield_not_in?(%w[0 4 5 6 8 e j w])
-                 else
-                   ''
-                 end
-          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)
+          parse_conference_detail_show_value(field, relator_map: relator_map)
         end
         conferences += record.fields('880').filter_map do |field|
           next unless subfield_value? field, '6', /^(111|711)/
@@ -150,6 +161,24 @@ module PennMARC
         conferences.uniq
       end
 
+      # Return hash of detailed conference values mapped to their corresponding facets from fields
+      # {https://www.loc.gov/marc/bibliographic/bd111.html 111} and
+      # {https://www.loc.gov/marc/bibliographic/bd711.html 711}. Does not include linked 880s.
+      # @param [MARC::Record] record
+      # @param [Hash] relator_map
+      # @return [Hash]
+      def conference_detail_show_facet_map(record, relator_map: Mappers.relator)
+        conferences = record.fields(%w[111 711]).filter_map do |field|
+          next unless field.indicator2.in? ['', ' ']
+
+          show = parse_conference_detail_show_value(field, relator_map: relator_map)
+          facet = parse_facet_value(field, FACET_SOURCE_MAP[field.tag.to_i].chars)
+          { show: show, facet: facet }
+        end
+
+        conferences.to_h { |conf| [conf[:show], conf[:facet]] }
+      end
+
       # Conference name values for searching
       # @param [MARC::Record] record
       # @return [Array<String>]
@@ -264,6 +293,40 @@ module PennMARC
         before_comma = substring_before(name, ', ')
         "#{after_comma} #{before_comma}".squish
       end
+
+      # Parse creator facet value from given creator field and desired subfields
+      # @param [MARC::Field] field
+      # @param [Array<String>] subfields
+      # @return [String]
+      def parse_facet_value(field, subfields)
+        trim_punctuation(join_subfields(field, &subfield_in?(subfields)))
+      end
+
+      # Parse creator show value from given main creator fields (100/110).
+      # @param [MARC::Field] field
+      # @param [Hash] relator_map
+      # @return [String]
+      def parse_show_value(field, relator_map: Mappers.relator)
+        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)
+      end
+
+      # Parse detailed conference show value from given conference field (111/711). If there is no $i, we join subfield
+      # values other than $0, $4, $5, $6, $8, $e, $j, and $w to create conference value. We join subfields $e and $w to
+      # determine the subunit value. We append any relators, preferring those defined in $4 and using $j as a fallback.
+      # @param [MARC::Field] field
+      # @return [String]
+      def parse_conference_detail_show_value(field, relator_map: Mappers.relator)
+        conf = if subfield_undefined? field, 'i'
+                 join_subfields field, &subfield_not_in?(%w[0 4 5 6 8 e j w])
+               else
+                 ''
+               end
+        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
     end
   end
 end

data/lib/pennmarc/helpers/date.rb

@@ -8,14 +8,14 @@ module PennMARC
       # Publication date is a four-digit year found in position 7-10 and may contain 'u' characters to represent
       # partially known dates. We replace any occurrences of 'u' with '0' before converting to DateTime object.
       # @param [MARC::Record] record
-      # @return [DateTime, nil] The publication date, or nil if date found in record is invalid
+      # @return [Time, nil] The publication date, or nil if date found in record is invalid
       def publication(record)
         record.fields('008').filter_map { |field|
           four_digit_year = sanitize_partially_known_date(field.value[7, 4], '0')
 
           next if four_digit_year.blank?
 
-          DateTime.new(four_digit_year.to_i)
+          Time.new(four_digit_year.to_i)
         }.first
       end
 
@@ -23,7 +23,7 @@ module PennMARC
       # {PennMARC::Enriched} maps enriched marc fields and subfields created during Alma publishing. The enriched
       # metadata provided by the Alma API does not include the date created value, so we can't work with that here.
       # @param [MARC::Record] record
-      # @return [DateTime, nil] The date added, or nil if date found in record is invalid
+      # @return [Time, nil] The date added, or nil if date found in record is invalid
       def added(record)
         record.fields(Enriched::Pub::ITEM_TAG).flat_map { |field|
           subfield_values(field, Enriched::Pub::ITEM_DATE_CREATED).filter_map do |date_added|
@@ -34,9 +34,10 @@ module PennMARC
 
             format = date_added.size == 10 ? '%Y-%m-%d' : '%Y-%m-%d %H:%M:%S'
 
-            DateTime.strptime(date_added, format)
+            Time.strptime(date_added, format)
           rescue StandardError => e
-            puts "Error parsing date in date added subfield: #{date_added} - #{e}"
+            puts 'Error parsing date in date added subfield. ' \
+                 "mmsid: #{Identifier.mmsid(record)}, value: #{date_added}, error: #{e}"
             nil
           end
         }.max
@@ -46,7 +47,7 @@ module PennMARC
       # Date last updated is a sixteen character String recorded in
       # {https://www.iso.org/iso-8601-date-and-time-format.html ISO 8601} format.
       # @param [MARC::Record] record
-      # @return [DateTime, nil] The date last updated, or nil if date found in record is invalid
+      # @return [Time, nil] The date last updated, or nil if date found in record is invalid
       def last_updated(record)
         record.fields('005').filter_map { |field|
           begin
@@ -56,9 +57,10 @@ module PennMARC
 
             next if date_time_string.start_with?('0000')
 
-            DateTime.iso8601(date_time_string).to_datetime
-          rescue ArgumentError => e
-            puts "Error parsing last updated date: #{date_time_string} - #{e}"
+            Time.strptime(date_time_string, '%Y%m%d%H%M%S.%N')
+          rescue StandardError => e
+            puts 'Error parsing last updated date. ' \
+                 "mmsid: #{Identifier.mmsid(record)}, value: #{date_time_string}, error: #{e}"
             nil
           end
         }.first

data/lib/pennmarc/mappings/locations.yml

@@ -547,6 +547,12 @@ dent:
     - Health Sciences Libraries
     - Levy Dental Medicine Library
   display: Levy Dental Medicine Library - Stacks
+dentpcare:
+  specific_location: Levy Dental Medicine Library - PCare
+  library:
+    - Health Sciences Libraries
+    - Levy Dental Medicine Library
+  display: Levy Dental Medicine Library - PCare
 dentrare:
   specific_location: Levy Dental Medicine Library - Rare Books
   library:

data/lib/pennmarc/version.rb

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

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

@@ -95,6 +95,23 @@ describe 'PennMARC::Creator' do
     end
   end
 
+  describe '.show_facet_map' do
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '100', subfields: { a: 'Surname, Name', '0': 'http://cool.uri/12345', d: '1900-2000',
+                                            e: 'author.', '4': 'http://cool.uri/vocabulary/relators/aut' }),
+        marc_field(tag: '110', subfields: { a: 'Group of People', b: 'Annual Meeting', '4': 'aut' }),
+        marc_field(tag: '880', subfields: { a: 'Ignore', '6': '100' })
+      ]
+    end
+
+    it 'returns expected hash' do
+      values = helper.show_facet_map(record, relator_map: mapping)
+      expect(values).to eq({ 'Surname, Name 1900-2000, author.' => 'Surname, Name 1900-2000',
+                             'Group of People Annual Meeting, Author.' => 'Group of People Annual Meeting' })
+    end
+  end
+
   describe '.show_aux' do
     let(:record) { marc_record fields: fields }
 
@@ -257,6 +274,22 @@ describe 'PennMARC::Creator' do
     end
   end
 
+  describe '.conference_detail_show_facet_map' do
+    let(:record) do
+      marc_record fields: [
+        marc_field(tag: '111', subfields: { a: 'Council of Trent', d: '(1545-1563 :', c: 'Trento, Italy)' }),
+        marc_field(tag: '711', subfields: { a: 'Code4Lib', n: '(18th :', d: '2024 :', c: 'Ann Arbor, MI)' }),
+        marc_field(tag: '880', subfields: { a: 'Alt Ignore', '6': '111' })
+      ]
+    end
+
+    it 'returns the expected hash' do
+      value = helper.conference_detail_show_facet_map(record)
+      expect(value).to eq({ 'Council of Trent (1545-1563 : Trento, Italy)' => 'Council of Trent Trento, Italy)',
+                            'Code4Lib (18th : 2024 : Ann Arbor, MI)' => 'Code4Lib (18th : Ann Arbor, MI)' })
+    end
+  end
+
   describe '.conference_search' do
     let(:record) do
       marc_record fields: [

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

@@ -10,7 +10,7 @@ describe 'PennMARC::Date' do
     let(:fields) { [marc_control_field(tag: '008', value: '130827s2010 nyu o 000 1 eng d')] }
 
     it 'returns publication date' do
-      expect(helper.publication(record)).to eq(DateTime.new(2010))
+      expect(helper.publication(record)).to eq(Time.new(2010))
     end
 
     it 'returns a year value' do
@@ -33,7 +33,7 @@ describe 'PennMARC::Date' do
       end
 
       it 'returns only the expected date_added value' do
-        expect(helper.added(record)).to eq DateTime.strptime('2023-10-19', '%Y-%m-%d')
+        expect(helper.added(record)).to eq Time.strptime('2023-10-19', '%Y-%m-%d')
       end
 
       it 'does not output any warning to STDOUT' do
@@ -47,7 +47,7 @@ describe 'PennMARC::Date' do
       let(:fields) { [marc_field(tag: 'itm', subfields: { q: '2023-06-28' })] }
 
       it 'returns expected value' do
-        expect(helper.added(record)).to eq(DateTime.strptime('2023-06-28', '%Y-%m-%d'))
+        expect(helper.added(record)).to eq(Time.strptime('2023-06-28', '%Y-%m-%d'))
       end
 
       it 'returns a year value' do
@@ -59,7 +59,7 @@ describe 'PennMARC::Date' do
       let(:fields) { [marc_field(tag: 'itm', subfields: { q: '2023-06-29 11:04:30:10' })] }
 
       it 'returns expected value' do
-        expect(helper.added(record)).to eq(DateTime.strptime('2023-06-29 11:04:30:10', '%Y-%m-%d %H:%M:%S'))
+        expect(helper.added(record)).to eq(Time.strptime('2023-06-29 11:04:30:10', '%Y-%m-%d %H:%M:%S'))
       end
 
       it 'returns a year value' do
@@ -74,12 +74,15 @@ describe 'PennMARC::Date' do
       end
 
       it 'returns most recent date' do
-        expect(helper.added(record)).to eq(DateTime.strptime('2023-06-29', '%Y-%m-%d'))
+        expect(helper.added(record)).to eq(Time.strptime('2023-06-29', '%Y-%m-%d'))
       end
     end
 
     context 'with invalid date' do
-      let(:fields) { [marc_field(tag: 'itm', subfields: { q: 'invalid date' })] }
+      let(:fields) do
+        [marc_control_field(tag: '001', value: 'mmsid'),
+         marc_field(tag: 'itm', subfields: { q: 'invalid date' })]
+      end
 
       it 'returns nil' do
         expect(helper.added(record)).to be_nil
@@ -88,7 +91,8 @@ describe 'PennMARC::Date' do
       it 'outputs error message' do
         expect {
           helper.added(record)
-        }.to output("Error parsing date in date added subfield: invalid date - invalid date\n").to_stdout
+        }.to output('Error parsing date in date added subfield. mmsid: mmsid, value: invalid date, ' \
+                    "error: invalid date or strptime format - `invalid date' `%Y-%m-%d %H:%M:%S'\n").to_stdout
       end
     end
   end
@@ -97,7 +101,7 @@ describe 'PennMARC::Date' do
     let(:fields) { [marc_field(tag: '005', subfields: { q: '20230213163851.1' })] }
 
     it 'returns date last updated' do
-      expect(helper.last_updated(record)).to eq(DateTime.iso8601('20230213163851.1').to_datetime)
+      expect(helper.last_updated(record)).to eq(Time.strptime('20230213163851.1', '%Y%m%d%H%M%S.%N'))
     end
 
     it 'returns year value' do
@@ -105,7 +109,10 @@ describe 'PennMARC::Date' do
     end
 
     context 'with invalid date' do
-      let(:fields) { [marc_field(tag: '005', subfields: { q: 'invalid date' })] }
+      let(:fields) do
+        [marc_control_field(tag: '001', value: 'mmsid'),
+         marc_field(tag: '005', subfields: { q: 'invalid date' })]
+      end
 
       it 'returns nil' do
         expect(helper.last_updated(record)).to be_nil
@@ -114,7 +121,8 @@ describe 'PennMARC::Date' do
       it 'outputs error message' do
         expect {
           helper.last_updated(record)
-        }.to output("Error parsing last updated date: invalid date - invalid date\n").to_stdout
+        }.to output('Error parsing last updated date. mmsid: mmsid, value: invalid date, ' \
+                    "error: invalid date or strptime format - `invalid date' `%Y%m%d%H%M%S.%N'\n").to_stdout
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.24
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport