umlaut 3.0.1 → 3.0.2

data/app/models/referent.rb

@@ -92,7 +92,7 @@ class Referent < ActiveRecord::Base
     oclcnum_ids = co.referent.identifiers.find_all { |i| i =~ /^info:oclcnum/}
     oclcnum_ids.each do |oclcnum_id|
       # FIXME Does this regex need "ocn" as well?
-      if (oclcnum_id =~ /^info:oclcnum\/(ocm0*|ocn0*|\(OCoLC\)0*|ocl70*|0+)(.*)$/)
+      if (oclcnum_id =~ /^info:oclcnum\/(ocm0*|ocn0*|on0*|\(OCoLC\)0*|ocl70*|0+)(.*)$/)
         # Delete the original, take out just the actual oclcnum, not
         # those old prefixes. or preceding 0s.
         co.referent.delete_identifier( oclcnum_id )

data/app/models/request.rb

@@ -293,11 +293,7 @@ class Request < ActiveRecord::Base
     # lexis nexis, so we'll consider it article-level. Since it is!
     return ( data['atitle'].blank? &&
              data['volume'].blank? &&
-             data['issue'].blank? &&
-             # A date means we're not title-level only if
-             # we're not a book. 
-             (data['date'].blank? ||
-              referent.format == "book") &&            
+             data['issue'].blank? &&            
         # pmid or doi is considered article-level, because SFX can
         # respond to those. Other identifiers may be useless. 
         (! referent.identifiers.find {|i| i =~ /^info\:(doi|pmid)/})

data/lib/marc_helper.rb

@@ -28,7 +28,8 @@ module MarcHelper
           next if urls_seen.include?(url)
   
           # Trying to avoid duplicates with SFX/link resolver. 
-          next if  should_skip_856_link?(request, marc_xml, url)
+           skip = should_skip_856_link?(request, marc_xml, url)
+           next if skip
           
           urls_seen.push(url)
           
@@ -120,13 +121,17 @@ module MarcHelper
   # still include. 
   def should_skip_856_link?(request, marc_record, url)
      is_journal = (marc_record.leader[7,1] == 's')
-
-     return (  is_journal && 
-               SfxUrl.sfx_controls_url?(url) && 
-                !(  request.title_level_citation? &&     
+     
+     sfx_controlled = SfxUrl.sfx_controls_url?(url)
+     
+     # Do NOT skip if it's a title-level citation with no
+     # existing full text entries. 
+     not_title_level_empty = !(  request.title_level_citation? &&     
                     request.get_service_type("fulltext").length == 0  
-                 )
-              )
+                 ) 
+
+     result = ( is_journal && sfx_controlled  && not_title_level_empty )
+     return result
   end
 
   # Take a ruby Marc Field object representing an 856 field,

data/lib/service_adaptors/worldcat_identities.rb

@@ -384,8 +384,7 @@ class WorldcatIdentities < Service
   end
   
   def clean_oclcnum(num)
-    # got the follow from referent.rb ~152 and added ocn
-    if num =~ /(ocn0*|ocm0*|\(OCoLC\)|ocl70*|0+)(.*)$/
+    if num =~ /(ocn0*|ocm0*|on0*|\(OCoLC\)|ocl70*|0+)(.*)$/
       num = $2
     end
     return num

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -575,7 +575,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2563544091378142822
+      hash: 3369968520259252587
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -584,7 +584,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2563544091378142822
+      hash: 3369968520259252587
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24