traject_umich_format 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2098b674ce8c54bef03577f03f3e743954d451fd
-  data.tar.gz: e65bc13f89da6b829fd646d212e52c480f1ef6b2
+  metadata.gz: 6d411084705b48267f928fb3b54469048cebacc8
+  data.tar.gz: c795fbc6fd5b11e7a7a27dd295df10fb7cf7e13b
 SHA512:
-  metadata.gz: a3ad30b3a10e55909ade4235adb09b3de8438ec4ce74bb7bfae7f9f68a214e9a944a92b6a3310a9a12f1c7107eab193ad4ab5eecbe6da1facc5b3d9461e15e1f
-  data.tar.gz: c4f6cff6555d07ae0cc0cf8073e57dbe73fdb9af98d526e0aa190ba152baf322879e9a0f7adac725d1a1ea43cd2f6252459580e94a40f67bc14f8fd5bd058238
+  metadata.gz: 5e093846baa19ebbc61532e41a049d774ce08432bac0ca510a17c1133ab425716f870a4bf4b4f5e40a8b0f81875b085439b1638ed3b3272beb87e86cd63e3333
+  data.tar.gz: ea0abc902497b4c46c9f403ce865752b3333eadf7712ca0b59aab0205c8cba3e659805c18750a4431e0e2d2488b9306598f8015b5b6f7bcc0188635f65054bd8

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 0.1.2 / 2013-10-22
+
+* Fix types logic so tests against different characters in the 007 or 006 must come from the
+same field (e.g., not 006[1]='s' in one 006, and 006[2]='t' in another 006). Affects VD, VH, 
+CF, and RC types.
+
 ### 0.1.1 / 2013-10-14
 
 * Fixed README to have correct load path (traject/umich_format, not traject_umich_format)

data/lib/traject/umich_format/bib_types.rb

@@ -84,22 +84,18 @@ class Traject::UMichFormat::BibTypes
     types << 'VB' if self['007[0-5]'].grep(/v...s/i).size > 0
     types << 'VB' if self['852j'].grep(/\A(?:bd-rom|video-b)/i).size > 0
 
+    @record.fields('007').map{|f| f.value}.each do |f|
+      if (f[0] == 'v') || self['008[33]'].include?('v')
+        types << 'VD' if f[4] == 'v'
+        types << 'VH' if f[4] == 'b'
+      end
+    end
 
-    types << 'VD' if self['007[4]'].include?('v') &&
-        (
-        self['007[0]'].include?('v') ||
-            self['008[33]'].include?('v')
-        )
 
     types << 'VD' if self['538a'].grep(/\Advd/i).size > 0
 
     types << 'VH' if self['538a'].grep(/\AVHS/i).size > 0
 
-    types << 'VH' if self['007[4]'].include?('b') &&
-        (
-        self['007[0]'].include?('v') ||
-            self['008[33]'].include?('v')
-        )
 
     types << 'VL' if self['007[0]'].include?('m')
     types << 'VL' if (self.bib_format == 'VM') && self['008[33]'].include?('m')
@@ -151,10 +147,14 @@ class Traject::UMichFormat::BibTypes
     f8524 = record.fields('852').select{|f| f.indicator1 == '4'}
 
     # RC
-    types << 'RC' if  %w[i j].include?(ldr6) &&
-        (bib_format == 'MU')  &&
-        self['007[1]'].include?('d') &&
-        self['007[12]'].include?('e')
+    if %w[i j].include?(ldr6) && (bib_format == 'MU') 
+      @record.fields('007').map{|f| f.value}.each do |f|
+        if f[1] == 'd' && f[12] == 'e'
+          types << 'RC'
+          break
+        end
+      end
+    end
 
     f8524.each do |f|
       if (f['b'].upcase == 'MUSIC') && (f['j'] =~ /\ACD/i)
@@ -214,7 +214,6 @@ class Traject::UMichFormat::BibTypes
   # TYP   WM Microform                      FMT   F00-02     EQUAL      VM
   #                                         008   F29-01     EQUAL      [a,b,c]
 
-
   def microform_types
     return [] unless record['008']
     types = ['WM']
@@ -377,10 +376,10 @@ class Traject::UMichFormat::BibTypes
 
     return ['XC'] if  (record['008'] && (record['008'].value[29] == '1')) || record.fields(['111', '711', '811']).size > 0
 
-    if  (bib_format == 'CF') &&
-        ((self['006[0]'] & %w[a s]).size > 0) &&
-        self['006[12]'].include?('1')
-      return ['XC']
+    if  (bib_format == 'CF')
+      @record.fields('006').map{|f| f.value}.each do |f|
+        return ['XC'] if  %w[a s].include?(f[0]) && (f[12] == '1')
+      end
     end
 
     if  (bib_format == 'MU') &&

data/lib/traject/umich_format/version.rb

@@ -1,5 +1,5 @@
 module Traject
   class UMichFormat
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traject_umich_format
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Bill Dueber
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler