pennmarc 1.0.12 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97610e7a00a2d206d84d5865ce9ebf14b5aa43e8081d9c4f559d198cc7adde23
-  data.tar.gz: fcee05f6a1999b674cb699605ee1e16b04fdda87e6bb7e65c3cb54958ef19ba5
+  metadata.gz: 76a91ac26d34008866dd6b66d66b9bbebf5d952d4bda7514d34a40b87f436244
+  data.tar.gz: 6d6813b9dcbadcf45905a48bb30dbc48fbe47ab081d8457d4936cb2263ba1c91
 SHA512:
-  metadata.gz: '0099dbb3f521e56f8ba94527e13085058191acfdaa3625f30f050da3bb96d8ae224eb9c6e9fb54620ea6d4640800bc38bd71602a59d66871eedd26c7f6287b4e'
-  data.tar.gz: 44cfade6b9c3ab3e0591553fbdf5c09f8be3467ccf71b0f003f7f0ff9dc8b08b1093d783b84c5f71ba3c98607a2d97f1e1ef62653cbe3af5361895d3cf964c1e
+  metadata.gz: a704d7a8957d042ad629446626fa8734e1d9b5c0ee65ba844343765d7c196ac0e8da3ae328213b1832556786b63a426c8ad2b4dc1e9b806795a723530d9367eb
+  data.tar.gz: 01f2d33cd2e7ec4a0aecb5f032bacd438a553d6d8667c5a0191e282f4722358fd23755b788a9ce21f32677d076e7224a04a73c24345f1146fd76198c42e9ebf3

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 10000`
-# on 2024-01-11 19:45:39 UTC using RuboCop version 1.51.0.
+# on 2024-01-17 17:00:02 UTC using RuboCop version 1.51.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -60,7 +60,7 @@ Metrics/CyclomaticComplexity:
     - 'lib/pennmarc/helpers/title.rb'
     - 'lib/pennmarc/util.rb'
 
-# Offense count: 25
+# Offense count: 26
 # Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Exclude:

data/lib/pennmarc/enriched.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+# Constants for Alma's MARC enrichment, performed and included in the MARCXML either by the Publishing process or by
+# API service
+module PennMARC
+  module Enriched
+    # Enriched MARC fields added by configurable setting in the Publishing profile that generates the MARCXML
+    # TODO: review if we can/should modify the subfields used in the pub profile to create parity with API subfields as
+    #       that could simplify this mapping tremendously
+    module Pub
+      # Enrichment Tag Names
+      PHYS_INVENTORY_TAG = 'hld'
+      ELEC_INVENTORY_TAG = 'prt'
+      ITEM_TAG = 'itm'
+
+      # Subfields for HLD tags
+      # Follow MARC 852 spec: https://www.loc.gov/marc/holdings/hd852.html, but names are translated into Alma parlance
+      PHYS_LOCATION_NAME = 'b' # e.g., Libra
+      PHYS_LOCATION_CODE = 'c' # e.g., stor
+      HOLDING_CLASSIFICATION_PART = 'h' # "classification part" first part of call num e.g., KF6450
+      HOLDING_ITEM_PART = 'i' # "item part?" second part of call num e.g., .C59 1989
+      PHYS_PUBLIC_NOTE = 'z'
+      PHYS_INTERNAL_NOTE = 'x'
+      PHYS_HOLDING_ID = '8'
+
+      # Subfields for ITM tags
+      ITEM_CURRENT_LOCATION = 'g'
+      ITEM_CALL_NUMBER_TYPE = 'h'
+      ITEM_CALL_NUMBER = 'i'
+      ITEM_DATE_CREATED = 'q'
+
+      # Subfields for PRT tags
+      ELEC_PORTFOLIO_ID = 'a'
+      ELEC_SERVICE_URL = 'b'
+      ELEC_COLLECTION_NAME = 'c'
+      ELEC_INTERFACE_NAME = 'e'
+      ELEC_PUBLIC_NOTE = 'f'
+      ELEC_COVERAGE_STMT = 'g'
+
+      # other values that could be added if we configured the Alma pub profile (and values are set on the record)
+      # - Authentication note
+      # - "static URL"
+      # - Electronic material type
+      # - Collection ID
+      # - create/update/activation date
+      # - license code
+      # - portfolio coverage info
+      #   - from year, until year (month, day volume issue)
+      # - portfolio embargo info
+      #   - years/months embargo'd
+
+      # TODO: evaluate this in context of changed boundwiths processing
+      # Franklin legacy note:
+      #   a subfield code NOT used by the MARC 21 spec for 852 holdings records.
+      #   we add this subfield during preprocessing to store boundwith record IDs.
+      # BOUND_WITH_ID = 'y'
+    end
+
+    # MARC enrichment originating from Alma API
+    # @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/ Alma docs
+    # We cannot modify these subfield settings
+    module Api
+      # Enrichment Tag Names
+      PHYS_INVENTORY_TAG = 'AVA'
+      ELEC_INVENTORY_TAG = 'AVE'
+
+      # Physical Holding (AVA) subfields
+      PHYS_CALL_NUMBER = 'd'
+      PHYS_CALL_NUMBER_TYPE = 'k'
+      PHYS_LIBRARY_CODE = 'b'
+      PHYS_LIBRARY_NAME = 'q'
+      PHYS_LOCATION_CODE = 'j'
+      PHYS_LOCATION_NAME = 'c'
+      PHYS_HOLDING_ID = '8'
+      PHYS_AVAILABILITY = 'e'
+      PHYS_TOTAL_ITEMS = 'f'
+      PHYS_UNAVAILABLE_ITEMS = 'g'
+      PHYS_SUMMARY_INFO = 'v'
+      PHYS_PRIORITY = 'p'
+
+      # Electronic Portfolio (AVE) subfields
+      ELEC_LIBRARY_CODE = 'l'
+      ELEC_COLLECTION_NAME = 'm'
+      ELEC_PUBLIC_NOTE = 'n'
+      ELEC_SERVICE_URL = 'u'
+      ELEC_COVERAGE_STMT = 's'
+      ELEC_INTERFACE_NAME = 't'
+      ELEC_PORTFOLIO_ID = '8'
+      ELEC_COLLECTION_ID = 'c'
+      ELEC_ACTIVATION_STATUS = 'e'
+    end
+  end
+end

data/lib/pennmarc/helpers/access.rb

@@ -33,14 +33,14 @@ module PennMARC
       # @param [MARC::Field] field
       # @return [Boolean]
       def electronic_holding_tag?(field)
-        field.tag.in? [EnrichedMarc::TAG_ELECTRONIC_INVENTORY, EnrichedMarc::AlmaApi::TAG_ELECTRONIC_INVENTORY]
+        field.tag.in? [Enriched::Pub::ELEC_INVENTORY_TAG, Enriched::Api::ELEC_INVENTORY_TAG]
       end
 
       # Does the record have added physical holding info?
       # @param [MARC::Field] field
       # @return [Boolean]
       def physical_holding_tag?(field)
-        field.tag.in? [EnrichedMarc::TAG_HOLDING, EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY]
+        field.tag.in? [Enriched::Pub::PHYS_INVENTORY_TAG, Enriched::Api::PHYS_INVENTORY_TAG]
       end
 
       # Check if a record contains an 856 entry for an online finding aid, meeting these criteria:

data/lib/pennmarc/helpers/classification.rb

@@ -16,13 +16,13 @@ module PennMARC
     }.freeze
 
     # Enriched MARC tags that hold classification data
-    TAGS = [EnrichedMarc::TAG_ITEM, EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY].freeze
+    TAGS = [Enriched::Pub::ITEM_TAG, Enriched::Api::PHYS_INVENTORY_TAG].freeze
 
     class << self
       # Parse classification values for faceting. We retrieve classification values from enriched MARC fields 'itm' or
       # 'AVA' originating respectively from the Alma publishing process or from the Alma Api. We return the
       # highest level LOC or Dewey classifications from each available call number, joining the class code with
-      # its title in a single string. See {PennMARC::EnrichedMarc} and {PennMARC::EnrichedMarc::AlmaApi} for more
+      # its title in a single string. See {PennMARC::Enriched} and {PennMARC::Enriched::Api} for more
       # information on the enriched MARC fields.
       # @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/ AVA docs
       # @param [MARC::Record] record
@@ -48,18 +48,18 @@ module PennMARC
       # @param [MARC::DataField] field
       # @return [String]
       def call_number_sf(field)
-        return EnrichedMarc::SUB_ITEM_CALL_NUMBER if field.tag == EnrichedMarc::TAG_ITEM
+        return Enriched::Pub::ITEM_CALL_NUMBER if field.tag == Enriched::Pub::ITEM_TAG
 
-        EnrichedMarc::AlmaApi::SUB_PHYSICAL_CALL_NUMBER
+        Enriched::Api::PHYS_CALL_NUMBER
       end
 
       # Retrieve subfield code that stores call number type on enriched marc field
       # @param [MARC::DataField] field
       # @return [String]
       def call_number_type_sf(field)
-        return EnrichedMarc::SUB_ITEM_CALL_NUMBER_TYPE if field.tag == EnrichedMarc::TAG_ITEM
+        return Enriched::Pub::ITEM_CALL_NUMBER_TYPE if field.tag == Enriched::Pub::ITEM_TAG
 
-        EnrichedMarc::AlmaApi::SUB_PHYSICAL_CALL_NUMBER_TYPE
+        Enriched::Api::PHYS_CALL_NUMBER_TYPE
       end
 
       # retrieve title of classification based on single char classification code and call number type

data/lib/pennmarc/helpers/creator.rb

@@ -10,82 +10,43 @@ module PennMARC
     class << self
       # Main tags for Author/Creator information
       TAGS = %w[100 110].freeze
+
       # Aux tags for Author/Creator information, for use in search_aux method
       AUX_TAGS = %w[100 110 111 400 410 411 700 710 711 800 810 811].freeze
 
+      CONFERENCE_SEARCH_TAGS = %w[111 711 811].freeze
+
+      # subfields NOT to join when combining raw subfield values
+      NAME_EXCLUDED_SUBFIELDS = %w[a 1 4 5 6 8 t].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
       # in ǂ4. To better handle name searches, returns names as both "First Last" and "Last, First" if a comma is found
-      # in ǂa. Also indexes any linked values in the 880. Some of the search fields remain incomplete and may need to be
-      # further investigated and ported when search result relevancy is considered.
-      # @todo this seems bad - why include relator labels? URIs? punctuation? leaving mostly as-is for now,
-      #       but this should be reexamined in the relevancy-tuning phase. URIs should def be removed. and shouldn't
-      #       indicator1 tell us the order of the name?
+      # in ǂa. Also indexes any linked values in the 880.
+      # @todo are we including too many details here and gumming up our index? consider UIRs, relator labels, dates...
+      # @todo shouldn't indicator1 tell us the order of the name? do we not trust the indicator?
       # @note ported from get_author_creator_1_search_values
       # @param [MARC::Record] record
       # @param [Hash] relator_map
       # @return [Array<String>] array of author/creator values for indexing
       def search(record, relator_map: Mappers.relator)
-        creator_subfields = %w[a 1 4 6 8]
-        acc = record.fields(TAGS).map do |field|
-          pieces = field.filter_map do |sf|
-            if sf.code == 'a'
-              convert_name_order(sf.value)
-            elsif creator_subfields.exclude?(sf.code)
-              sf.value
-            elsif sf.code == '4'
-              relator = translate_relator(sf.value, relator_map)
-              next if relator.blank?
-
-              relator
-            end
-          end
-          value = join_and_squish(pieces)
-          if value.end_with?('.', '-')
-            value
-          else
-            "#{value}."
-          end
-        end
-        # a second iteration over the same fields produces name entries with the names not reordered
-        secondary_subfields = %w[4 6 8]
-        acc += record.fields(TAGS).map do |field|
-          pieces = field.filter_map do |sf|
-            if secondary_subfields.exclude?(sf.code)
-              sf.value
-            elsif sf.code == '4'
-              relator = translate_relator(sf.value, relator_map)
-              next if relator.blank?
-
-              relator
-            end
-          end
-          value = join_and_squish(pieces)
-          if value.end_with?('.', '-')
-            value
-          else
-            "#{value}."
-          end
-        end
-        acc += record.fields(%w[880]).filter_map do |field|
-          next unless field.any? { |sf| sf.code == '6' && sf.value.in?(%w[100 110]) }
-
-          suba = field.find_all(&subfield_in?(%w[a])).map { |sf|
-            convert_name_order(sf.value)
-          }.first
-          oth = join_and_squish(field.find_all(&subfield_not_in?(%w[6 8 a t])).map(&:value))
-          join_and_squish [suba, oth]
-        end
-        acc.uniq
+        name_search_values record: record, tags: TAGS, relator_map: relator_map
       end
 
       # Auxiliary Author/Creator search field
+      # This duplicates the values returned by the search method, but adds in additional MARC tags to include
+      # creator-adjacent entities. The added 4xx tags are mostly obsolete, but the 7xx tags are important. See:
+      # {https://www.loc.gov/marc/bibliographic/bd700.html MARC 700},
+      # {https://www.loc.gov/marc/bibliographic/bd710.html MARC 710},
+      # and {https://www.loc.gov/marc/bibliographic/bd711.html MARC 711}. The 800, 810 and 8111 tags are similar in
+      # theme to the 7xx fields but apply to serial records.
       # @note ported from get_author_creator_2_search_values
-      # @todo port this later
       # @param [MARC::Record] record
       # @return [Array<String>] array of extended author/creator values for indexing
-      def search_aux(record); end
+      def search_aux(record, relator_map: Mappers.relator)
+        name_search_values record: record, tags: AUX_TAGS, relator_map: relator_map
+      end
 
       # All author/creator values for display (like #show, but multivalued?) - no 880 linkage
       # @note ported from get_author_creator_values (indexed as author_creator_a) - shown on results page
@@ -180,9 +141,14 @@ module PennMARC
         end
       end
 
-      # @todo this supports "Conference" fielded search and may not be needed
-      # @note see get_conference_search_values
-      def conference_search(record); end
+      # Conference name values for searching
+      # @param [MARC::Record] record
+      # @return [Array<String>]
+      def conference_search(record)
+        record.fields(CONFERENCE_SEARCH_TAGS).filter_map do |field|
+          join_subfields(field, &subfield_in?(%w[a c d e]))
+        end
+      end
 
       # Retrieve contributor values for display from fields {https://www.oclc.org/bibformats/en/7xx/700.html 700}
       # and {https://www.oclc.org/bibformats/en/7xx/710.html 710} and their linked alternates. Joins subfields
@@ -222,6 +188,32 @@ module PennMARC
 
       private
 
+      # @param [MARC::Record] record
+      # @param [Array] tags to consider
+      # @param [Hash] relator_map
+      # @return [Array<String>] name values from given tags
+      def name_search_values(record:, tags:, relator_map:)
+        acc = record.fields(tags).filter_map do |field|
+          name_from_main_entry field, relator_map, should_convert_name_order: false
+        end
+
+        acc += record.fields(tags).filter_map do |field|
+          name_from_main_entry field, relator_map, should_convert_name_order: true
+        end
+
+        acc += record.fields(['880']).filter_map do |field|
+          next unless field.any? { |sf| sf.code == '6' && sf.value.in?(tags) }
+
+          suba = field.find_all(&subfield_in?(%w[a])).filter_map { |sf|
+            convert_name_order(sf.value)
+          }.first
+          oth = join_and_squish(field.find_all(&subfield_not_in?(%w[6 8 a t])).map(&:value))
+          join_and_squish [suba, oth]
+        end
+
+        acc.uniq
+      end
+
       # Trim punctuation method extracted from Traject macro, to ensure consistent output
       # @todo move to Util?
       # @param [String] string
@@ -244,11 +236,14 @@ module PennMARC
 
       # Extract the information we care about from 1xx fields, map relator codes, and use appropriate punctuation
       # @param [MARC::Field] field
+      # @param [Hash] mapping
+      # @param [Boolean] should_convert_name_order
       # @return [String] joined subfield values for value from field
-      def name_from_main_entry(field, mapping)
-        name_subfields = %w[0 1 4 6 8]
+      def name_from_main_entry(field, mapping, should_convert_name_order: false)
         s = field.filter_map { |sf|
-          if name_subfields.exclude?(sf.code)
+          if sf.code == 'a'
+            should_convert_name_order ? convert_name_order(sf.value) : sf.value
+          elsif NAME_EXCLUDED_SUBFIELDS.exclude?(sf.code)
             " #{sf.value}"
           elsif sf.code == '4'
             relator = translate_relator(sf.value, mapping)

data/lib/pennmarc/helpers/date.rb

@@ -20,13 +20,13 @@ module PennMARC
       end
 
       # Retrieve date added (subfield 'q') from enriched marc 'itm' field.
-      # {PennMARC::EnrichedMarc} maps enriched marc fields and subfields created during Alma publishing. The enriched
+      # {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
       def added(record)
-        record.fields(EnrichedMarc::TAG_ITEM).flat_map { |field|
-          subfield_values(field, EnrichedMarc::SUB_ITEM_DATE_CREATED).filter_map do |date_added|
+        record.fields(Enriched::Pub::ITEM_TAG).flat_map { |field|
+          subfield_values(field, Enriched::Pub::ITEM_DATE_CREATED).filter_map do |date_added|
             # On 2022-05-02, this field value (as exported in enriched publishing
             # job from Alma) began truncating time to day-level granularity. We have
             # no guarantee that this won't switch back in the future, so for the

data/lib/pennmarc/helpers/format.rb

@@ -165,14 +165,14 @@ module PennMARC
       # @param [MARC::Record] record
       # @return [Array]
       def call_nums(record)
-        if field_defined?(record, EnrichedMarc::TAG_HOLDING)
-          record.fields(EnrichedMarc::TAG_HOLDING).map do |field|
-            join_subfields(field, &subfield_in?([EnrichedMarc::SUB_HOLDING_CLASSIFICATION_PART,
-                                                 EnrichedMarc::SUB_HOLDING_ITEM_PART]))
+        if field_defined?(record, Enriched::Pub::PHYS_INVENTORY_TAG)
+          record.fields(Enriched::Pub::PHYS_INVENTORY_TAG).map do |field|
+            join_subfields(field, &subfield_in?([Enriched::Pub::HOLDING_CLASSIFICATION_PART,
+                                                 Enriched::Pub::HOLDING_ITEM_PART]))
           end
-        elsif field_defined?(record, EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY)
-          record.fields(EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY).map do |field|
-            join_subfields(field, &subfield_in?([EnrichedMarc::AlmaApi::SUB_PHYSICAL_CALL_NUMBER_TYPE]))
+        elsif field_defined?(record, Enriched::Api::PHYS_INVENTORY_TAG)
+          record.fields(Enriched::Api::PHYS_INVENTORY_TAG).map do |field|
+            join_subfields(field, &subfield_in?([Enriched::Api::PHYS_CALL_NUMBER_TYPE]))
           end
         else
           []

data/lib/pennmarc/helpers/helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../enriched_marc'
+require_relative '../enriched'
 require_relative '../mappers'
 require_relative '../util'
 

data/lib/pennmarc/helpers/inventory.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require_relative 'inventory_entry/electronic'
+require_relative 'inventory_entry/physical'
+
+module PennMARC
+  # Methods for extracting holdings information ("inventory") when available
+  class Inventory < Helper
+    PHYSICAL_INVENTORY_TAGS = [
+      Enriched::Pub::PHYS_INVENTORY_TAG,
+      Enriched::Api::PHYS_INVENTORY_TAG
+    ].freeze
+
+    ELECTRONIC_INVENTORY_TAGS = [
+      Enriched::Pub::ELEC_INVENTORY_TAG,
+      Enriched::Api::ELEC_INVENTORY_TAG
+    ].freeze
+
+    class << self
+      # Hash of Physical holdings information
+      # @param [MARC::Record] record
+      # @return [Array, nil]
+      def physical(record)
+        source = enrichment_source(record)
+        return unless source
+
+        record.fields(PHYSICAL_INVENTORY_TAGS).map do |entry|
+          InventoryEntry::Physical.new(entry, source).to_h
+        end
+      end
+
+      # Hash of Electronic inventory information
+      # @param [MARC::Record] record
+      # @return [Array, nil]
+      def electronic(record)
+        source = enrichment_source(record)
+        return unless source
+
+        record.fields(ELECTRONIC_INVENTORY_TAGS).map do |entry|
+          InventoryEntry::Electronic.new(entry, source).to_h
+        end
+      end
+
+      # Count of all electronic portfolios
+      # @param [MARC::Record] record
+      # @return [Integer]
+      def electronic_portfolio_count(record)
+        record.count { |field| field.tag.in? %w[AVE prt] }
+      end
+
+      # Count of all physical holdings
+      # @param [MARC::Record] record
+      # @return [Integer]
+      def physical_holding_count(record)
+        record.count { |field| field.tag.in? %w[AVA hld] }
+      end
+
+      private
+
+      # Determine the source of the MARC inventory enrichment
+      # @param [MARC::Record] record
+      # @return [Symbol, nil]
+      def enrichment_source(record)
+        if pub_enrichment_tags?(record)
+          :pub
+        elsif api_enrichment_tags?(record)
+          :api
+        end
+      end
+
+      # Does the record include tags from Publishing inventory enrichment?
+      # @todo move to Util?
+      # @param [MARC::Record] record
+      # @return [Boolean]
+      def pub_enrichment_tags?(record)
+        record.tags.intersect?(
+          [Enriched::Pub::PHYS_INVENTORY_TAG, Enriched::Pub::ELEC_INVENTORY_TAG, Enriched::Pub::ITEM_TAG]
+        )
+      end
+
+      # Does the record include tags from API inventory enrichment?
+      # @todo move to Util?
+      # @param [MARC::Record] record
+      # @return [Boolean]
+      def api_enrichment_tags?(record)
+        record.tags.intersect?(
+          [Enriched::Api::PHYS_INVENTORY_TAG, Enriched::Api::ELEC_INVENTORY_TAG]
+        )
+      end
+    end
+  end
+end

data/lib/pennmarc/helpers/inventory_entry/base.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module PennMARC
+  module InventoryEntry
+    # Base class for InventoryEntry classes, defines required interface
+    class Base
+      attr_reader :source, :field, :mapper
+
+      # @param [MARC::DataField] inventory_field
+      # @param [Symbol] source
+      def initialize(inventory_field, source)
+        @source = source
+        @field = inventory_field
+        @mapper = @source == :api ? Enriched::Api : Enriched::Pub
+      end
+
+      # @return [Hash]
+      def to_h
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/pennmarc/helpers/inventory_entry/electronic.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module PennMARC
+  module InventoryEntry
+    # Represent a Electronic inventory entry - simple because the subfield specification is identical across
+    # entries returned by the API and Alma Publishing enrichment
+    class Electronic < Base
+      # @return [Hash{Symbol->Unknown}]
+      def to_h
+        { portfolio_id: field[mapper::ELEC_PORTFOLIO_ID],
+          url: field[mapper::ELEC_SERVICE_URL],
+          collection_name: field[mapper::ELEC_COLLECTION_NAME],
+          coverage: field[mapper::ELEC_COVERAGE_STMT],
+          note: field[mapper::ELEC_PUBLIC_NOTE] }
+      end
+    end
+  end
+end

data/lib/pennmarc/helpers/inventory_entry/physical.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module PennMARC
+  module InventoryEntry
+    # Represent a Physical inventory entry
+    class Physical < Base
+      # Call number from inventory entry
+      # @return [String (frozen)]
+      def call_num
+        if source == :pub
+          "#{field[mapper::HOLDING_CLASSIFICATION_PART]}#{field[mapper::HOLDING_ITEM_PART]}"
+        elsif source == :api
+          field[mapper::PHYS_CALL_NUMBER]
+        end
+      end
+
+      # Priority for inventory entry
+      # @note we currently don't return priority in our publishing enrichment
+      # @return [String, nil]
+      def priority
+        return nil if source == :pub
+
+        field[mapper::PHYS_PRIORITY]
+      end
+
+      # @return [Hash{Symbol->Unknown}]
+      def to_h
+        { holding_id: field[mapper::PHYS_HOLDING_ID],
+          location_name: field[mapper::PHYS_LOCATION_NAME],
+          location_code: field[mapper::PHYS_LOCATION_CODE],
+          call_num: call_num,
+          priority: priority }
+      end
+    end
+  end
+end

data/lib/pennmarc/helpers/location.rb

@@ -3,10 +3,12 @@
 module PennMARC
   # Methods that return Library and Location values from Alma enhanced MARC fields
   class Location < Helper
+    ONLINE_LIBRARY = 'Online library'
+
     class << self
       # Retrieves library location from enriched marc 'itm' or 'hld' fields, giving priority to the item location over
       # the holdings location. Returns item's location if available. Otherwise, returns holding's location.
-      # {PennMARC::EnrichedMarc} maps enriched marc fields and subfields created during Alma publishing.
+      # {PennMARC::Enriched} maps enriched marc fields and subfields created during Alma publishing.
       # @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/
       #   Alma documentation for these added fields
       # @param [MARC::Record] record
@@ -19,7 +21,7 @@ module PennMARC
       # Retrieves the specific location from enriched marc 'itm' or 'hld' fields, giving priority to the item location
       # over the holdings location. Returns item library location if available. Otherwise, returns holdings library
       # location.
-      # {PennMARC::EnrichedMarc} maps enriched marc fields and subfields created during Alma publishing.
+      # {PennMARC::Enriched} maps enriched marc fields and subfields created during Alma publishing.
       # @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/
       #   Alma documentation for these added fields
       # @param [MARC::Record] record
@@ -31,7 +33,7 @@ module PennMARC
 
       # Base method to retrieve location data from enriched marc 'itm' or 'hld' fields, giving priority to the item
       # location over the holdings location. Returns item location if available. Otherwise, returns holdings location.
-      # {PennMARC::EnrichedMarc} maps enriched marc fields and subfields created during Alma publishing.
+      # {PennMARC::Enriched} maps enriched marc fields and subfields created during Alma publishing.
       # @see https://developers.exlibrisgroup.com/alma/apis/docs/bibs/R0VUIC9hbG1hd3MvdjEvYmlicy97bW1zX2lkfQ==/
       #   Alma documentation for these added fields
       # @param [MARC::Record] record
@@ -61,7 +63,9 @@ module PennMARC
             location_map[subfield.value.to_sym][display_value.to_sym]
           }.flatten.compact_blank
         }.uniq
-        locations << 'Online library' if record.fields(PennMARC::EnrichedMarc::TAG_ELECTRONIC_INVENTORY).any?
+        if record.tags.intersect?([Enriched::Pub::ELEC_INVENTORY_TAG, Enriched::Api::ELEC_INVENTORY_TAG])
+          locations << ONLINE_LIBRARY
+        end
         locations
       end
 
@@ -82,17 +86,18 @@ module PennMARC
         # Since item records may reflect locations more accurately, we use them if they exist;
         # if not, we use the holdings.
 
-        tag = PennMARC::EnrichedMarc::TAG_HOLDING
-        subfield_code = PennMARC::EnrichedMarc::SUB_HOLDING_SHELVING_LOCATION
-
         # if the record has an enriched item field present, use it
-        if field_defined?(record, PennMARC::EnrichedMarc::TAG_ITEM)
-          tag = PennMARC::EnrichedMarc::TAG_ITEM
-          subfield_code = PennMARC::EnrichedMarc::SUB_ITEM_CURRENT_LOCATION
-        # otherwise, use the api enriched field value
-        elsif field_defined?(record, EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY)
-          tag = EnrichedMarc::AlmaApi::TAG_PHYSICAL_INVENTORY
-          subfield_code = EnrichedMarc::AlmaApi::SUB_HOLDING_LOCATION_CODE
+        if field_defined?(record, Enriched::Pub::ITEM_TAG)
+          tag = Enriched::Pub::ITEM_TAG
+          subfield_code = Enriched::Pub::ITEM_CURRENT_LOCATION
+        # if the record has API inventory tags, use them
+        elsif field_defined?(record, Enriched::Api::PHYS_INVENTORY_TAG)
+          tag = Enriched::Api::PHYS_INVENTORY_TAG
+          subfield_code = Enriched::Api::PHYS_LOCATION_CODE
+        # otherwise use Pub holding tags
+        else
+          tag = Enriched::Pub::PHYS_INVENTORY_TAG
+          subfield_code = Enriched::Pub::PHYS_LOCATION_CODE
         end
 
         { tag: tag, subfield_code: subfield_code }