blacklight-marc 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dad28dda5b571d3d111370ddab6cdbd03bab70b
-  data.tar.gz: 0177360550a4b9b7387790c51dd543b8c1396c4a
+  metadata.gz: b0b44e5b957d4a934e1df678bb1e80994e3fd3ec
+  data.tar.gz: 9e12245e21d1da293c21cc3e8d0b6e4119a244a7
 SHA512:
-  metadata.gz: 82744f0a7fb2e5a2688753211de0a5fa449caca6682d7ae78eada10819828d0e0e67cd9b380339d9c1f7ba53a231dff1618f3a19618f4b67b0c01c410378dfee
-  data.tar.gz: 283589fa380fe66a421a93a6354b9555b965ac72091dd06fd777535679a45d5fe58375cad0482ac7e38a9b41646e8bab7b381a2b4fb6dcd12b0203bccf6a35c8
+  metadata.gz: 4a6175d6dfc1be58f1d833549708a8708f840d24a556828fcbb113c444e5590c0c6c495f42a1c8a6fe9caabee06f6a46cb56e08662cd5249160be0715f37f4b1
+  data.tar.gz: 28d2c19fabb43958c4ea0649035ad010898589365ee5f79ffdabdf2e2d2316f2097283719204e8657e894fcc237a3b4cca5fa159a0817e38c1b8e990efbfc937

data/lib/blacklight/marc/indexer/formats.rb

@@ -5,7 +5,7 @@ module Blacklight::Marc::Indexer::Formats
       v = v.upcase
       case
       when (v.start_with? 'A')
-        vals << (v == 'AD') ? 'Atlas' : 'Map'
+        vals << (v == 'AD' ? 'Atlas' : 'Map')
       when (v.start_with? 'C')
         case
         when (v == "CA")
@@ -107,7 +107,7 @@ module Blacklight::Marc::Indexer::Formats
       field007hasC
     end
 
-    def self.map_leader(f_000,field007hasC,vals)
+    def self.map_leader(f_000,field007hasC,vals,record)
       f_000 = f_000.upcase
       case
       when (f_000.start_with? 'C')
@@ -139,15 +139,13 @@ module Blacklight::Marc::Indexer::Formats
           vals << ((field007hasC) ? "eBook" : "Book")
         elsif f_000 == 'AS' 
           # Look in 008 to determine what type of Continuing Resource
-          formatCode = extract_marc("008[21]", first: true) do |r,a|
-            format_code = a.upcase
-            if format_code == 'N'
-              vals << 'Newspaper'
-            elsif format_code == 'P'
-              vals << 'Journal'
-            else
-              vals << 'Serial'
-            end
+          format_code = Traject::Macros::Marc21.extract_marc_from(record, "008[21]", first: true, default: "").first.upcase
+          if format_code == 'N'
+            vals << 'Newspaper'
+          elsif format_code == 'P'
+            vals << 'Journal'
+          else
+            vals << 'Serial'
           end
         end
       end
@@ -174,12 +172,12 @@ module Blacklight::Marc::Indexer::Formats
         else
           # check the Leader - this is NOT a repeating field
           # if we find a matching value there, grab it and return.
-          FormatMap.map_leader(record.leader[6,2],field007hasC,vals)
+          FormatMap.map_leader(record.leader[6,2],field007hasC,vals,record)
           unless vals.empty?
             vals.uniq!
             accumulator.concat vals
           else
-            FormatMap.map_leader(record.leader[6],field007hasC,vals)
+            FormatMap.map_leader(record.leader[6],field007hasC,vals,record)
             if vals.empty?
               accumulator.concat ['Unknown']
             else
@@ -191,4 +189,4 @@ module Blacklight::Marc::Indexer::Formats
       end
     end
   end
-end
+end

data/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = '6.1.1'
+    VERSION = '6.2.0'
   end
 end

data/lib/generators/blacklight/marc/templates/app/models/marc_indexer.rb

@@ -1,6 +1,6 @@
 $:.unshift './config'
 class MarcIndexer < Blacklight::Marc::Indexer
-  # this mixin defines lambda facotry method get_format for legacy marc formats
+  # this mixin defines lambda factory method get_format for legacy marc formats
   include Blacklight::Marc::Indexer::Formats
 
   def initialize
@@ -158,4 +158,4 @@ class MarcIndexer < Blacklight::Marc::Indexer
       end
     end
   end
-end
+end

data/spec/lib/indexer/formats_spec.rb

@@ -41,6 +41,14 @@ describe Blacklight::Marc::Indexer::Formats do
       subject.get_format.call(record,val,subject)
       expect(val).to eql(['TapeCartridge'])
     end
+    it 'should map for 007 field with AD value' do
+      record = double('Record')
+      allow(record).to receive(:fields).with(["245", "880"]).and_return([])
+      expect(record).to receive(:fields).with(["007", "880"]).and_return([MARC::ControlField.new('007','AD')])
+      val = []
+      subject.get_format.call(record,val,subject)
+      expect(val).to eql(['Atlas'])
+    end
     it 'should map for leader' do
       record = double('Record')
       allow(record).to receive(:fields).with(["245", "880"]).and_return([])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -346,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: MARC support for Blacklight