pennmarc 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21463a3d231e3ba853929bc03241d8e3c109c6191d3a5747c1a397aad40e454d
-  data.tar.gz: e747a26ee6ed508b13a3079acd2291d194d4a9a9bc4a984dcefd8145d5f76084
+  metadata.gz: bc89ffad46c996296dc5cd84d8a2b9c81b82653b24c9d16f6aa9e12c9c3c6aaa
+  data.tar.gz: 5e1f488f73b07970e4242a7bbffb1536db2f800e73db72d4ad9b33d75375ad38
 SHA512:
-  metadata.gz: ee0a42b85b4862caca7417176947497d63253d07818341e3ef483789554dfcf06eff4f658a89d44d865e7354f4dcae3e88e060cdd41c941e016de5d86e8ad365
-  data.tar.gz: ca200369654cb607e14ea1225ce785a90ca05da9f5fe9a3a7390748b997b4b5e423f26a1c832bfab14c339a493af39f2422171b647542f92a926e5c2a7405993
+  metadata.gz: 61a8aded7159b786a45213d03c4eb17b60eced7dba21e79b8b634a03bccdcd7f1e312f5205431e3215a95fbdba91ad60611312a03939f3c03bfc39b85dc5dc88
+  data.tar.gz: 756c4a538eedd1fd7b9bc12a347547863ea8674965c3a87669a32ca39d3c50724af0a17e3d1747e7e3a06385a9c6b55aead58d8c5d091996af5c37ed1c1641ba

data/Gemfile

@@ -3,6 +3,7 @@
 source 'https://rubygems.org'
 
 gem 'activesupport', '~> 7'
+gem 'lcsort'
 gem 'library_stdnums', '~> 1.6'
 gem 'marc', '~> 1.2'
 gem 'nokogiri', '~> 1.15'

data/Gemfile.lock

@@ -13,6 +13,7 @@ GEM
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
+    lcsort (0.9.1)
     library_stdnums (1.6.0)
     marc (1.2.0)
       rexml
@@ -111,6 +112,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 7)
+  lcsort
   library_stdnums (~> 1.6)
   marc (~> 1.2)
   nokogiri (~> 1.15)

data/lib/pennmarc/helpers/classification.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'lcsort'
+
 module PennMARC
   # Generates library of congress and dewey classifications using call number data.
   class Classification < Helper
@@ -42,26 +44,53 @@ module PennMARC
         }.uniq
       end
 
+      # Return a normalized Call Number value for sorting purposes. This uses the Lcsort gem normalization logic, which
+      # returns nil for non-LC call numbers. For now, this returns only the call number values from the enrichment
+      # inventory fields.
+      # @note this could be made more efficient by just returning the first value, but in the future we may want to be
+      #       more discerning about which call number we return (longest?)
+      # @param record [MARC::Record]
+      # @return [String, nil] a normalized call number
+      def sort(record)
+        values(record, loc_only: true).filter_map { |val| Lcsort.normalize(val) }.first
+      end
+
       # Parse call number values from inventory fields, including both hld and itm fields from publishing enrichment.
       # Return only unique values.
       # @param record [MARC::Record]
       # @return [Array<String>] array of call numbers from inventory fields
       def call_number_search(record)
+        values(record, loc_only: false)
+      end
+
+      # Return raw call number values from inventory fields
+      # @param record [MARC::Record]
+      # @param loc_only [Boolean] whether or not to explicitly return only LOC call numbers from ITM & AVA inventory
+      # @return [Array<String>]
+      def values(record, loc_only:)
         call_nums = record.fields(TAGS).filter_map do |field|
+          next if loc_only && !loc_call_number_type?(subfield_values(field, call_number_type_sf(field))&.first)
+
           subfield_values(field, call_number_sf(field))
         end
 
-        # Ensure we get call numbers for records with no `itm` tags by also checking `hld` and de-duping
-        call_nums += record.fields([Enriched::Pub::PHYS_INVENTORY_TAG]).filter_map do |field|
+        call_nums += hld_field_call_nums(record)
+        call_nums.flatten.uniq
+      end
+
+      private
+
+      # Get call nums from `hld` tags. Useful if no call nums are available from `itm` tags
+      # @param record [MARC::Record]
+      # @return [Array<String>]
+      def hld_field_call_nums(record)
+        record.fields([Enriched::Pub::PHYS_INVENTORY_TAG]).filter_map do |field|
           first = subfield_values(field, Enriched::Pub::HOLDING_CLASSIFICATION_PART)&.first
           last = subfield_values(field, Enriched::Pub::HOLDING_ITEM_PART)&.first
           "#{first} #{last}".squish.presence
         end
-        call_nums.flatten.uniq
       end
 
-      private
-
       # Retrieve subfield code that stores the call number on enriched marc field
       # @param field [MARC::DataField]
       # @return [String]
@@ -106,10 +135,10 @@ module PennMARC
       end
 
       # Determine whether call number type is library of congress
-      # @param call_number_type [String] value from call number type subfield
+      # @param call_number_type [String, nil] value from call number type subfield
       # @return [Boolean]
       def loc_call_number_type?(call_number_type)
-        call_number_type == '0'
+        call_number_type == LOC_CALL_NUMBER_TYPE
       end
     end
   end

data/lib/pennmarc/version.rb

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

data/pennmarc.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.2'
 
   s.add_dependency 'activesupport', '~> 7'
+  s.add_dependency 'lcsort', '~> 0.9'
   s.add_dependency 'library_stdnums', '~> 1.6'
   s.add_dependency 'marc', '~> 1.2'
   s.add_dependency 'nokogiri', '~> 1.15'

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

@@ -43,6 +43,86 @@ describe 'PennMARC::Classification' do
     end
   end
 
+  describe '.sort' do
+    context 'with enrichment via the Alma publishing process and no valid call number' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => 'Secret Drawer Copy'
+                    }),
+         marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::DEWEY_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => '691.3 B2141'
+                    })]
+      end
+
+      it 'returns nil' do
+        expect(helper.sort(record)).to be_nil
+      end
+    end
+
+    context 'with enrichment via the Alma publishing process and itm fields' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => 'QL756 .S643'
+                    }),
+         marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => 'Secret Drawer Copy'
+                    }),
+         marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG, subfields: {
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::DEWEY_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => '691.3 B2141'
+                    })]
+      end
+
+      it 'returns a normalized version of the first valid call number' do
+        expect(helper.sort(record)).to eq 'QL.0756.S643'
+      end
+    end
+
+    context 'with enrichment via the Alma publishing process including both hld and itm fields' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::ITEM_TAG,
+                    subfields: { PennMARC::Enriched::Pub::ITEM_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                                 PennMARC::Enriched::Pub::ITEM_CALL_NUMBER => 'QL756 .S643 1989' }),
+         marc_field(tag: PennMARC::Enriched::Pub::PHYS_INVENTORY_TAG,
+                    subfields: { PennMARC::Enriched::Pub::HOLDING_CLASSIFICATION_PART => 'QL756',
+                                 PennMARC::Enriched::Pub::HOLDING_ITEM_PART => '.S643' })]
+      end
+
+      it 'returns a normalized version of the first valid call number' do
+        expect(helper.sort(record)).to eq 'QL.0756.S643.1989'
+      end
+    end
+
+    context 'with enrichment via the Alma publishing process and only hld fields' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Pub::PHYS_INVENTORY_TAG,
+                    subfields: { PennMARC::Enriched::Pub::HOLDING_CLASSIFICATION_PART => 'KF6450',
+                                 PennMARC::Enriched::Pub::HOLDING_ITEM_PART => '.C59 1989' })]
+      end
+
+      it 'returns expected normalized value' do
+        expect(helper.sort(record)).to eq 'KF.6450.C59.1989'
+      end
+    end
+
+    context 'with enrichment with availability info via Alma Api' do
+      let(:fields) do
+        [marc_field(tag: PennMARC::Enriched::Api::PHYS_INVENTORY_TAG, subfields: {
+                      PennMARC::Enriched::Api::PHYS_CALL_NUMBER_TYPE => helper::LOC_CALL_NUMBER_TYPE,
+                      PennMARC::Enriched::Api::PHYS_CALL_NUMBER => 'QL756 .S643'
+                    })]
+      end
+
+      it 'returns expected normalized value' do
+        expect(helper.sort(record)).to eq 'QL.0756.S643'
+      end
+    end
+  end
+
   describe '.call_number_search' do
     let(:fields) do
       [marc_field(tag: config[:tag],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,6 +28,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: lcsort
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: library_stdnums
   requirement: !ruby/object:Gem::Requirement