pennmarc 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb5991760f2f82ed299e5602451881e8b71a88fec9cae1f570afe8e5c90d56f9
-  data.tar.gz: d0fa00068ed63eb1ea9de2127f706c4076b56eb567ac29fc0e88c77a74b5605d
+  metadata.gz: 3409e098b2447b1f3eb3295e8df39d2b3e5133a9594f93f0b017132700b3fdd6
+  data.tar.gz: 02a38f6ffff4ce8032b4f60e9bcc2de3945c14b8d249bf83e2ffff26cb8c1a60
 SHA512:
-  metadata.gz: edff4fba2a3e3edf56b7e7fb79992f595becf46e588fa81cb4ed327153deacc6a4bf2c8b040808830f5963e2c64db8a6165bfbdcb04698884ac5ebe4b997d4f0
-  data.tar.gz: f3024891d0d48b13e18b3d25ec09e33c134cb77a152bb3849079589b893f99eef9489b8a81307cab14d941467d36242f829c0a9120d42b24064e862c9411fe80
+  metadata.gz: 7e3c34f9063ca03595f9e45adf23c4f8c4f27a369b874eaf9944ce11b60f16cf8298bfb7a169094c5fe9b6b1fc726eb68272b996085c5092a65d03bce9bde893
+  data.tar.gz: c304b6f45e769ecc13cb0b17230448a87d1f52b5fe496587663ed88383cc4a7288a4422dbca685c6229fee69fae8d6964ee9d332bb95c6aa0dd5e04ced5909b7

data/lib/pennmarc/helpers/access.rb

@@ -7,12 +7,15 @@ module PennMARC
     AT_THE_LIBRARY = 'At the library'
     HANDLE_BASE_URL = 'hdl.library.upenn.edu'
     COLENDA_BASE_URL = 'colenda.library.upenn.edu'
+    REQUIRED_ONLINE_MARC_INDICATOR_COUNT = 2
 
     class << self
       # Based on enhanced metadata fields added by Alma publishing process or API, determine if the record has
       # electronic access or has physical holdings, and is therefore "Online" or "At the library". If a record is "At
       # the library", but has a link to a finding aid in the 856 field (matching certain criteria), also add 'Online' as
       # an access method.
+      # Because Alma E-Collections don't return electronic inventory, check some MARC control fields and other fields
+      # for indicators of an online resource, but only if no other Online indicators are present.
       # @param record [MARC::Record]
       # @return [Array]
       def facet(record)
@@ -24,7 +27,7 @@ module PennMARC
         return values if values.size == 2 # return early if all values are already present
 
         # only check if ONLINE isn't already there
-        values << ONLINE if values.exclude?(ONLINE) && resource_link?(record)
+        values << ONLINE if values.exclude?(ONLINE) && marc_indicators?(record)
         values.uniq
       end
 
@@ -44,6 +47,24 @@ module PennMARC
         field.tag.in? [Enriched::Pub::PHYS_INVENTORY_TAG, Enriched::Api::PHYS_INVENTORY_TAG]
       end
 
+      # In order to determine if a record has Online access, we should also check some MARC fields. This is because the
+      # Alma inventory publishing process does not include tags for E-Collections associated with a record. Here we
+      # check for obvious indicators:
+      #  - a "Resource Link" matching certain criteria
+      #  - a field indicating that the record is part of our curated "Databases" collection
+      # If there's still no online access, check for at least two other positive indicators in other MARC control fields
+      # and other tags.
+      # @param record [MARC::Record]
+      # @return [Boolean]
+      def marc_indicators?(record)
+        return true if resource_link?(record) || electronic_database?(record)
+
+        [eresource_form?(record),
+         eresource_material_designation?(record),
+         online_computer_file_form?(record),
+         online_carrier_type?(record)].count(true) >= REQUIRED_ONLINE_MARC_INDICATOR_COUNT
+      end
+
       # Check if a record contains an 856 entry with a Penn Handle server link meeting these criteria:
       # 1. Indicator 1 is 4 (HTTP resource)
       # 2. Indicator 2 is NOT 2 (indicating the linkage is to a "related" thing)
@@ -58,6 +79,58 @@ module PennMARC
         record.fields('856').any? { |field| valid_resource_field?(field) }
       end
 
+      # Does the record have an 006 suggesting an electronic resource?
+      # Check position 6 "Form of item" for an `o` indicating "Online"
+      # @see https://www.loc.gov/marc/bibliographic/bd006.html
+      # @see https://www.loc.gov/marc/bibliographic/bd008c.html
+      # @param record [MARC::Record]
+      # @return [Boolean]
+      def eresource_form?(record)
+        return false unless field_defined?(record, '006')
+
+        record.fields('006').first.value[6] == 'o'
+      end
+
+      # Does the record have an 007 indicating an electronic resource?
+      # Check pos 0 for a `c` ("Electronic resource") and position 1 for an `r` ("Remote")
+      # @see https://www.loc.gov/marc/bibliographic/bd007c.html
+      # @param record [MARC::Record]
+      # @return [Boolean]
+      def eresource_material_designation?(record)
+        return false unless field_defined?(record, '007')
+
+        record.fields('007').first.value[0..1] == 'cr'
+      end
+
+      # Does the record have an 008 indicating an electronic resource?
+      # https://www.loc.gov/marc/bibliographic/bd008c.html
+      # @param record [MARC::Record]
+      # @return [Boolean]
+      def online_computer_file_form?(record)
+        return false unless field_defined?(record, '008')
+
+        record.fields('008').first.value[23] == 'o'
+      end
+
+      # Does the record have an 338 indicating an electronic resource?
+      # @see https://www.loc.gov/marc/bibliographic/bd338.html, https://www.loc.gov/standards/valuelist/rdacarrier.html
+      # @param record [MARC::Record]
+      # @return [Boolean]
+      def online_carrier_type?(record)
+        return false unless field_defined?(record, '338')
+
+        return false unless subfield_values_for(tag: '338', subfield: 'a', record: record).include?('online resource')
+
+        subfield_values_for(tag: '338', subfield: 'b', record: record).include?('cr')
+      end
+
+      # Databases are always electronic resources
+      # @param record [MARC::Record]
+      # @return [Boolean]
+      def electronic_database?(record)
+        Database.type_facet(record).any?
+      end
+
       # Check if a field contains valid resource
       # @param field [MARC::Field]
       # @return [Boolean]

data/lib/pennmarc/helpers/creator.rb

@@ -90,9 +90,10 @@ module PennMARC
       # @return [Array<String>] array of author/creator values for display
       def extended_show(record, relator_map: Mappers.relator)
         fields = record.fields(%w[100 700])
+        fields += record.fields('880').select { |field| subfield_value?(field, '6', /^(#{TAGS.join('|')})/) }
         fields.filter_map { |field|
-          # for 700 entries, only include ones with relator code ('4') = aut, or code 'e' = 'author'
-          next if field.tag == '700' && !(field['4']&.downcase == 'aut' || field['e']&.downcase&.start_with?('author'))
+          # for 700 and 880 entries, only include ones with relator code ('4') = aut, or code 'e' = 'author'
+          next if field.tag.in?(%w[700 880]) && !describes_author?(field)
 
           parse_show_value(field, relator_map: relator_map)
         }.uniq
@@ -106,7 +107,7 @@ module PennMARC
       def extended_show_facet_map(record, relator_map: Mappers.relator)
         creators = record.fields(%w[100 700]).filter_map do |field|
           # for 700 entries, only include ones with relator code ('4') = aut, or code 'e' = 'author'
-          next if field.tag == '700' && !(field['4']&.downcase == 'aut' || field['e']&.downcase&.start_with?('author'))
+          next if field.tag == '700' && !describes_author?(field)
 
           show = parse_show_value(field, relator_map: relator_map)
           facet = parse_facet_value(field, FACET_SOURCE_MAP[field.tag.to_i].chars)
@@ -465,6 +466,13 @@ module PennMARC
 
         append_relator(field: field, joined_subfields: conf, relator_term_sf: 'j', relator_map: relator_map)
       end
+
+      # Does the given field describe an author record, as indicated by the relator fields of sf 4 or sf e ?
+      # @param [MARC::Field] field
+      # @return [Boolean]
+      def describes_author?(field)
+        field['4']&.downcase == 'aut' || field['e']&.downcase&.start_with?('author')
+      end
     end
   end
 end

data/lib/pennmarc/mappings/locations.yml

@@ -66,10 +66,6 @@ carpco:
   library: Special Collections
   display: Carpenters' Company of the City and County of Philadelphia
   aeon: true
-catoffice:
-  specific_location: Athenaeum of Philadelphia - Cataloging Office
-  library: Athenaeum of Philadelphia
-  display: Athenaeum of Philadelphia - Cataloging Office
 circcoll:
   specific_location: Athenaeum of Philadelphia - Circulating Collection
   library: Athenaeum of Philadelphia
@@ -83,10 +79,6 @@ cidirbusrm:
   library: Athenaeum of Philadelphia
   display: Athenaeum of Philadelphia - City Directories Busch Room
   aeon: true
-collcare:
-  specific_location: Athenaeum of Philadelphia - Collections Care Manager
-  library: Athenaeum of Philadelphia
-  display: Athenaeum of Philadelphia - Collections Care Manager
 fic:
   specific_location: Athenaeum of Philadelphia - Fiction
   library: Athenaeum of Philadelphia
@@ -128,11 +120,6 @@ rarecoll:
   library: Athenaeum of Philadelphia
   display: Athenaeum of Philadelphia - Rare Books Collection
   aeon: true
-reevecoll:
-  specific_location: Athenaeum of Philadelphia - Reeve Collection
-  library: Athenaeum of Philadelphia
-  display: Athenaeum of Philadelphia - Reeve Collection
-  aeon: true
 ref:
   specific_location: Athenaeum of Philadelphia - Reference
   library: Athenaeum of Philadelphia
@@ -293,13 +280,6 @@ cjsarcths:
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Archives Thesis
   aeon: true
-cjsartif:
-  specific_location: Library at the Katz Center - Reading Room
-  library:
-    - Special Collections
-    - Library at the Katz Center for Advanced Judaic Studies
-  display: Library at the Katz Center - Artifacts
-  aeon: true
 cjsbox1:
   specific_location: Library at the Katz Center - Stacks
   library: Library at the Katz Center for Advanced Judaic Studies
@@ -312,22 +292,10 @@ cjsbox3:
   specific_location: Library at the Katz Center - Stacks
   library: Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Stacks Box 3
-cjsbox4:
-  specific_location: Library at the Katz Center - Stacks
-  library: Library at the Katz Center for Advanced Judaic Studies
-  display: Library at the Katz Center - Stacks Box 4
 cjscdrom:
   specific_location: Library at the Katz Center - Reading Room
   library: Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - CD-ROM
-cjscirc:
-  specific_location: Library at the Katz Center - Reading Room
-  library: Library at the Katz Center for Advanced Judaic Studies
-  display: Library at the Katz Center - Circulation
-cjscomp:
-  specific_location: Library at the Katz Center - Reading Room
-  library: Library at the Katz Center for Advanced Judaic Studies
-  display: Library at the Katz Center - Computer Room
 cjsdir:
   specific_location: Library at the Katz Center - Stacks
   library: Library at the Katz Center for Advanced Judaic Studies
@@ -438,10 +406,6 @@ cjspergal:
   specific_location: Library at the Katz Center - Reading Room
   library: Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Periodicals Gallery
-cjsperover:
-  specific_location: Library at the Katz Center - Stacks
-  library: Library at the Katz Center for Advanced Judaic Studies
-  display: Library at the Katz Center - Periodicals Oversize
 cjsrar:
   specific_location: Library at the Katz Center - Rare Book Room
   library:
@@ -531,12 +495,6 @@ cjsreffol+:
   specific_location: Library at the Katz Center - Reading Room
   library: Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Reference Oversize
-cjsres:
-  specific_location: Library at the Katz Center - Reading Room
-  library:
-    - Library at the Katz Center for Advanced Judaic Studies
-    - Reserve
-  display: Library at the Katz Center - Reserves
 cjsspec:
   specific_location: Library at the Katz Center - Stacks
   library:
@@ -842,12 +800,7 @@ mideast:
   specific_location: Van Pelt - Stapleton Seminar Room
   library: Van Pelt-Dietrich Library Center
   display: Van Pelt - Stapleton Seminar Room (523)
-mideastres:
-  specific_location: Van Pelt - Middle East Seminar Reserve
-  library:
-    - Van Pelt-Dietrich Library Center
-    - Reserve
-  display: Van Pelt - Middle East Seminar Reserve
+
 mscirc:
   specific_location: Penn Museum Library - Circulation
   library: Penn Museum Library
@@ -1073,12 +1026,6 @@ sasiarefe:
   specific_location: Van Pelt - Govindaraju/Chandrasekhara South Asia Studies Seminar Room
   library: Van Pelt-Dietrich Library Center
   display: Van Pelt - Govindaraju/Chandrasekhara South Asia Studies Seminar Room (551)
-sasiarese:
-  specific_location: Van Pelt - South Asian Reserve
-  library:
-    - Van Pelt-Dietrich Library Center
-    - Reserve
-  display: Van Pelt - South Asia Reserve (551)
 scg123:
   specific_location: Kislak Center for Special Collections - Rare Book Collection
   library:
@@ -1479,10 +1426,6 @@ stor:
   specific_location: LIBRA
   library: LIBRA
   display: LIBRA
-storcirc:
-  specific_location: LIBRA - Circulation
-  library: LIBRA
-  display: LIBRA - Circulation
 storcrstxt:
   specific_location: GIC Collection at Penn Libraries
   library:
@@ -1526,13 +1469,6 @@ scrunning:
     - LIBRA
   display: LIBRA Running Press Collection
   aeon: true
-storvilain:
-  specific_location: LIBRA Vilain-Wieck Collection
-  library: 
-    - Special Collections
-    - LIBRA
-  display: LIBRA Vilain-Wieck Collection
-  aeon: true
 univarch:
   specific_location: University Archives
   library: University Archives
@@ -1649,7 +1585,7 @@ vetewellrm:
     - Veterinary
     - 'Veterinary: Atwood Library (Campus)'
   display: 'Veterinary: Atwood Library (Campus)- Wellness Room'  
-vpexhibit:
+vpexhibits:
   specific location: Van Pelt - Exhibits and Events
   library: Van Pelt-Dietrich Library Center
   display: Van Pelt - Exhibits and Events -- First Floor, Circulation Desk

data/lib/pennmarc/version.rb

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

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

@@ -105,5 +105,64 @@ describe 'PennMARC::Access' do
         end
       end
     end
+
+    context 'with an electronic record but no electronic inventory provided' do
+      let(:record) { marc_record fields: fields }
+
+      context 'with physical inventory' do
+        let(:fields) do
+          [marc_field(tag: PennMARC::Enriched::Pub::PHYS_INVENTORY_TAG),
+           marc_field(tag: '944', subfields: { a: 'Database & Article Index',
+                                               b: 'Dictionaries and Thesauri (language based)' })]
+        end
+
+        it 'adds in additional Online access value' do
+          expect(helper.facet(record)).to contain_exactly PennMARC::Access::AT_THE_LIBRARY, PennMARC::Access::ONLINE
+        end
+      end
+
+      context 'with a 944 indicating an online database' do
+        let(:fields) do
+          [marc_field(tag: '944', subfields: { a: 'Database & Article Index',
+                                               b: 'Dictionaries and Thesauri (language based)' })]
+        end
+
+        it 'returns expected Online access value' do
+          expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE)
+        end
+      end
+
+      context 'with a single MARC indicator check suggesting an online database' do
+        let(:fields) do
+          [marc_control_field(tag: '006', value: '      o    ')]
+        end
+
+        it 'does not return Online access value' do
+          expect(helper.facet(record)).not_to include PennMARC::Access::ONLINE
+        end
+      end
+
+      context 'with two MARC indicators suggesting an online database' do
+        let(:fields) do
+          [marc_control_field(tag: '006', value: '      o    '),
+           marc_control_field(tag: '007', value: 'cr')]
+        end
+
+        it 'returns expected Online access value' do
+          expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE)
+        end
+      end
+
+      context 'with other two MARC indicators suggesting an online database' do
+        let(:fields) do
+          [marc_control_field(tag: '008', value: '970325c19959999nyuwr d o 0 2eng '),
+           marc_field(tag: '338', subfields: { a: 'online resource', b: 'cr' })]
+        end
+
+        it 'returns expected Online access value' do
+          expect(helper.facet(record)).to contain_exactly(PennMARC::Access::ONLINE)
+        end
+      end
+    end
   end
 end

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

@@ -100,12 +100,12 @@ describe 'PennMARC::Creator' do
       let(:fields) do
         [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: '880', subfields: { a: 'Surname, Alternative', '6': '100' })]
+         marc_field(tag: '880', subfields: { a: 'Surname, Alternative', e: 'author', '6': '100' })]
       end
 
-      it 'returns single author values with no URIs anywhere (the same as show)' do
+      it 'returns single author values and linked alternate with no URIs anywhere (the same as show)' do
         values = helper.extended_show(record)
-        expect(values).to contain_exactly 'Surname, Name 1900-2000, author.'
+        expect(values).to contain_exactly 'Surname, Name 1900-2000, author.', 'Surname, Alternative, author.'
         expect(values.join.downcase).not_to include 'http'
       end
     end

metadata

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