pennmarc 1.4.4 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4a2e39c878c88cf1cdfdf3c72a102c8bb9b5677939e70b6e6824f0d027acfa3
-  data.tar.gz: 062afb834246c65bedf207c28c5e8ea81d73926b36631be963a31459548537b4
+  metadata.gz: e7fc0d8c3919655fd8c163b6cbe4da2b38e2988238532fe24dc8f62d784fb5ab
+  data.tar.gz: a9a907d91af9f7cffb42147803137bb9d7bca7cdc553a749575684bc3b96381b
 SHA512:
-  metadata.gz: 77c4b9f5133f7be9142970428718a634d762e120c04d3feed44c5a50b76415f81adc41b4c5ca1a31fe155bd0d7e80abf013fd7b843d52e20d3fbf2f837770326
-  data.tar.gz: 3e74b0b50f37762ebb4c20ea3816a05f4664cecdc4084a535c10bb6db34c25a3a8545d25e726632031cc327d6dcf4a61dd8555e4e119a6060e663b128823558e
+  metadata.gz: ffe68635b6ccb154b26edb8cc65a381fff97db77d284a20b8d5643d96895288d6e0caae592a2ae897d500bcdfd1b3a0c2fb9df5c8abcf3809010a9c146ec5dbf
+  data.tar.gz: '09cf7165edcf2031a921517dd4cdb9364faed586a53c88f9fde8d6e0d79d4fefe7ba8a5a2e4ca7f69cf50dfef22e82b3fc4001d0a64c39c520f8f71ebae4f5ab'

data/lib/pennmarc/helpers/format.rb

@@ -85,7 +85,12 @@ module PennMARC
         # any of these
         formats << MANUSCRIPT if include_manuscripts?(format_code)
         formats << ARCHIVE if archive?(record)
-        formats << MICROFORMAT if micro_or_microform?(call_nums(record), f007, f008, media_type, title_medium)
+
+        if micro_or_microform?(micro_code(record.leader, f006_forms, f008),
+                               call_nums(record), f007, media_type, title_medium)
+          formats << MICROFORMAT
+        end
+
         formats << THESIS_DISSERTATION if thesis_or_dissertation?(format_code, record)
         formats << CONFERENCE_EVENT if conference_event?(record)
         formats << NEWSPAPER if newspaper?(f008, format_code)
@@ -275,14 +280,28 @@ module PennMARC
         record.fields('502').any? && format_code.in?(%w[am tm dm])
       end
 
+      # @param leader [String]
+      # @param f006_forms [Array<String>]
+      # @param f008 [String]
+      # @return [String]
+      def micro_code(leader, f006_forms, f008)
+        map_or_visual = %w[e g k r]
+
+        if map_or_visual.include?(leader[6]) || f006_forms.any? { |str| map_or_visual.include?(str) }
+          f008[29] || ' '
+        else
+          f008[23] || ' '
+        end
+      end
+
+      # @param micro_code [String]
       # @param call_nums [Array<String>]
       # @param f007 [Array<String>]
-      # @param f008 [String]
       # @param title_medium [Array<String>]
       # @param media_type [Array<String>]
       # @return [Boolean]
-      def micro_or_microform?(call_nums, f007, f008, media_type, title_medium)
-        [f008[23], f008[29]].any? { |v| v.in?(%w[a b c]) } ||
+      def micro_or_microform?(micro_code, call_nums, f007, media_type, title_medium)
+        %w[a b c].include?(micro_code) ||
           f007.any? { |v| v.start_with?('h') } ||
           title_medium.any? { |val| val =~ /micro/i } ||
           call_nums.any? { |val| val =~ /micro/i } ||

data/lib/pennmarc/helpers/genre.rb

@@ -43,18 +43,13 @@ module PennMARC
         }.uniq
       end
 
-      # Genre values for faceting. We only set Genre facet values for movies (videos) and manuscripts(?), and ensure
-      # that the headings come from our set of approved ontologies.
+      # Genre values for faceting.
+      # @note Prior to 5/2026, we only set Genre facet values for movies (videos) and manuscripts.
       # @todo the Genre facet in Franklin is pretty ugly. It could be cleaned up by limiting the subfields included
       #       here and cleaning up punctuation.
       # @param record [MARC::Record]
       # @return [Array<String>]
       def facet(record)
-        format_code = record.leader[6] || ' '
-        manuscript = Format.include_manuscripts?(format_code)
-        video = record.fields('007').any? { |field| field.value.starts_with? 'v' }
-        return [] unless manuscript || video
-
         record.fields('655').filter_map { |field|
           next unless allowed_genre_field?(field)
 

data/lib/pennmarc/mappings/locations.yml

@@ -317,7 +317,7 @@ cjsfol:
   library: Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Stacks Folio
 cjsgf:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
@@ -338,7 +338,7 @@ cjshur:
   display: Library at the Katz Center - Hurowitz Collection
   aeon: true
 cjsincun:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
@@ -351,7 +351,7 @@ cjsinproc:
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Processing
 cjsinprocn:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
@@ -407,77 +407,77 @@ cjspergal:
   library: Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Periodicals Gallery
 cjsrar:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
-  display: Library at the Katz Center - Rare Book Room
+  display: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   aeon: true
 cjsraram:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Rare Book Americana
   aeon: true
 cjsrarbx1:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Rare Book Box 1
   aeon: true
 cjsrarbx2:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Rare Book Box 2
   aeon: true
 cjsrarbx3:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Rare Book Box 3
   aeon: true
 cjsrarbx4:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Rare Book Box 4
   aeon: true
 cjsrarfol:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Rare Book Folio
   aeon: true
 cjsrargiga:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Rare Book Giant
   aeon: true
 cjsrarmini:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Rare Book Miniature
   aeon: true
 cjsrarms:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
   display: Library at the Katz Center - Rare Book Manuscript
   aeon: true
 cjsrarover:
-  specific_location: Library at the Katz Center - Rare Book Room
+  specific_location: Library at the Katz Center - Ione Apfelbaum & Hilary Strauss Rare Book Room
   library:
     - Special Collections
     - Library at the Katz Center for Advanced Judaic Studies
@@ -1220,12 +1220,12 @@ scinc:
   display: Kislak Center for Special Collections - Incunables
   aeon: true
 sckatzstor:
-  specific_location: LIBRA Rare Library at the Katz Center
+  specific_location: LIBRA - Rare Library at the Katz Center
   library:
     - Special Collections
     - LIBRA
     - Library at the Katz Center for Advanced Judaic Studies
-  display: LIBRA Rare Library at the Katz Center
+  display: LIBRA - Rare Library at the Katz Center
   aeon: true
 sclea:
   specific_location: Kislak Center for Special Collections - Lea Collection
@@ -1361,12 +1361,19 @@ scstor:
     - LIBRA
   display: LIBRA - Rare Book Collection Storage
   aeon: true
+scstorcomx:
+  specific_location: LIBRA - Rare Comics Collection
+  library:
+    - Special Collections
+    - LIBRA
+  display: LIBRA - Rare Comics Collection
+  aeon: true
 scstorvil:
-  specific_location: LIBRA Vilain-Wieck Collection
+  specific_location: LIBRA - Vilain-Wieck Collection
   library: 
     - Special Collections
     - LIBRA
-  display: LIBRA Vilain-Wieck Collection
+  display: LIBRA - Vilain-Wieck Collection
   aeon: true
 scteer:
   specific_location: Kislak Center for Special Collections - Teerink Collection
@@ -1377,12 +1384,11 @@ scteer:
   display: Kislak Center for Special Collections - Teerink Collection
   aeon: true
 sctehon:
-  specific_location: Kislak Center for Special Collections - Tehon Collection
+  specific_location: LIBRA - Tehon Collection
   library:
     - Special Collections
-    - Kislak Center for Special Collections
-    - Van Pelt-Dietrich Library Center
-  display: Kislak Center for Special Collections - Tehon Collection
+    - LIBRA
+  display: LIBRA - Tehon Collection
   aeon: true
 sctress:
   specific_location: Kislak Center for Special Collections - Arthur Tress Collection
@@ -1432,41 +1438,41 @@ storcrstxt:
     - GIC Collection
   display: GIC Collection at Penn Libraries
 storfine:
-  specific_location: LIBRA Fisher Fine Arts
+  specific_location: LIBRA - Fisher Fine Arts
   library: LIBRA
-  display: LIBRA Fisher Fine Arts
+  display: LIBRA - Fisher Fine Arts
   aeon: true
 storm:
   specific_location: LIBRA
   library: LIBRA
   display: LIBRA - Music
 storlimit:
-  specific_location: LIBRA Limited
+  specific_location: LIBRA - Limited
   library:
     - Special Collections
     - LIBRA
-  display: LIBRA Limited
+  display: LIBRA - Limited
   aeon: true
 storrare:
-  specific_location: LIBRA Rare
+  specific_location: LIBRA - Rare
   library:
     - Special Collections
     - LIBRA
-  display: LIBRA Rare
+  display: LIBRA - Rare
   aeon: true
 storspec:
-  specific_location: LIBRA Special
+  specific_location: LIBRA - Special
   library:
     - Special Collections
     - LIBRA
-  display: LIBRA Special
+  display: LIBRA - Special
   aeon: true
 scrunning:
-  specific_location: LIBRA Running Press Collection
+  specific_location: LIBRA - Running Press Collection
   library:
     - Special Collections
     - LIBRA
-  display: LIBRA Running Press Collection
+  display: LIBRA - Running Press Collection
   aeon: true
 univarch:
   specific_location: University Archives

data/lib/pennmarc/version.rb

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

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

@@ -106,11 +106,11 @@ describe 'PennMARC::Format' do
         end
       end
 
-      context 'with 008 field and valid value at position 23' do
+      context 'with non-map/visual record (LDR06 and 006/00 not egkr) and 008 field valid value at position 23' do
         let(:record) do
-          marc_record fields: [
-            marc_control_field(tag: '008', value: '                       a')
-          ]
+          marc_record leader: '     h',
+                      fields: [marc_control_field(tag: '006', value: 'c  '),
+                               marc_control_field(tag: '008', value: '                       a')]
         end
 
         it 'returns "Microformat"' do
@@ -118,11 +118,23 @@ describe 'PennMARC::Format' do
         end
       end
 
-      context 'with 008 field and valid value at position 29' do
+      context 'with map/visual record (LDR06 value egkr) and 008 field valid value at position 29' do
         let(:record) do
-          marc_record fields: [
-            marc_control_field(tag: '008', value: '                             a')
-          ]
+          marc_record leader: '      k',
+                      fields: [marc_control_field(tag: '008', value: '                             b')]
+        end
+
+        it 'returns "Microformat"' do
+          expect(formats).to contain_exactly('Microformat')
+        end
+      end
+
+      context 'with map/visual record (LDR06 not egkr but 006/00 is), and 008 field valid value at position 29' do
+        let(:record) do
+          marc_record leader: '      h',
+                      fields: [marc_control_field(tag: '006', value: 'a  '),
+                               marc_control_field(tag: '006', value: 'g  '),
+                               marc_control_field(tag: '008', value: '                             c')]
         end
 
         it 'returns "Microformat"' do

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

@@ -42,44 +42,17 @@ describe 'PennMARC::Genre' do
 
   describe '.facet' do
     let(:values) { helper.facet(record) }
-
-    context 'with a non-video, non-manuscript record' do
-      let(:fields) do
-        [marc_control_field(tag: '007', value: 'x'),
-         marc_field(tag: 'hld', subfields: { c: 'vanp' }),
-         marc_field(tag: '655', indicator2: '0', subfields: { a: 'Genre.' })]
-      end
-
-      it 'returns no genre values for faceting' do
-        expect(values).to be_empty
-      end
-    end
-
-    context 'with a video record' do
-      let(:fields) do
-        [marc_control_field(tag: '007', value: 'v'),
-         marc_field(tag: 'hld', subfields: { c: 'vanp' }),
-         marc_field(tag: '655', indicator2: '0', subfields: { a: 'Documentary films' }),
-         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Sports', '2': 'fast' }),
-         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Le cyclisme', '2': 'qlsp' }), # excluded due to sf2
-         marc_field(tag: '655', indicator2: '1', subfields: { a: 'Shredding' })] # excluded, invalid indicator value
-      end
-
-      it 'contains only the desired genre facet values' do
-        expect(values).to contain_exactly 'Documentary films', 'Sports'
-      end
+    let(:fields) do
+      [marc_control_field(tag: '007', value: 'v'),
+       marc_field(tag: 'hld', subfields: { c: 'vanp' }),
+       marc_field(tag: '655', indicator2: '0', subfields: { a: 'Documentary films' }),
+       marc_field(tag: '655', indicator2: '7', subfields: { a: 'Sports', '2': 'fast' }),
+       marc_field(tag: '655', indicator2: '7', subfields: { a: 'Le cyclisme', '2': 'qlsp' }), # excluded due to sf2
+       marc_field(tag: '655', indicator2: '1', subfields: { a: 'Shredding' })] # excluded, invalid indicator value
     end
 
-    context 'with a manuscript record' do
-      let(:record) { marc_record fields: fields, leader: '      t' }
-      let(:fields) do
-        [marc_control_field(tag: '007', value: 'x'),
-         marc_field(tag: '655', indicator2: '7', subfields: { a: 'Astronomy', '2': 'fast' })]
-      end
-
-      it 'returns the expected genre values' do
-        expect(values).to contain_exactly 'Astronomy'
-      end
+    it 'contains only the genre facet values from approved ontologies' do
+      expect(values).to contain_exactly 'Documentary films', 'Sports'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.6
 platform: ruby
 authors:
 - Mike Kanning
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-26 00:00:00.000000000 Z
+date: 2026-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport