umlaut 4.0.1 → 4.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGNlZDU2MTIxYjg1Y2ViYjZkNThjNDY4MjJhMDQ1ZDlkNTFjMjg5Mg==
+    M2JkNmQyMDRkYTIxNGE2YjZlOWNjYWM5MDY2NDk1MmNlYjBiMzg2Yw==
   data.tar.gz: !binary |-
-    ZDYwM2IwZDE2MDVkMjY1ZDE2ZjRjZmVmYTg0MWMxNWM2ZjNlNDMxNw==
+    ZTEzMzAzNjM1OWZiMWY5YzAyZjFiYTBhZDYxYzE1MjdlMmVmMGU5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDJkODQ3OTZhY2VlMGE2OWNkMmZiZWJhM2RlZjY3ZDA0MzUwOWEzNGRiNGQy
-    MmFjY2ZjNzFiYjQxNzY2Mzc0MzZiMTUyY2UxMDRhZDZjODAxMDZmNWY0ODU2
-    ZGNhNTdjZDI0ZjgzMGM1NTdmNGUzNzUzYjlhYjViYTZkZDZjMjk=
+    YmFmZjIzMDUyN2RmNDIxMTI4MDJmNTI2ZjNhMDRkYmFlYjg0MzkwMTIzYWM4
+    YmEyMDA2MTNhZDJlNzk3NTc4YzczNzAyN2ZjODliY2E5MWMwYjI4NWRhZjY5
+    ZWMzNDEwODBjNmE0OTgwNTc2NmZjNDQxMjY5NDc0MWE2Y2Q3ZWY=
   data.tar.gz: !binary |-
-    MzlhZmI2YmE3ZjFiOWM3MDhhNmM0MTdhZmM5N2U5NmYzYWVjOGYwMDg2Y2Vk
-    NjVjNjQ2ZTc1MTlkYzViZmY4ZmE3MjE1Njc3ZTZlYTFmMjgwN2JhMWU1MDAz
-    Y2YwNGM5Zjg4MjUwNGFhYjhmMzQ2YmQ0YmEyYzJjNTVlZGQwZDU=
+    YjY0OWQ0YTdjNDE5ZTI5ZDMwOWVmMTE1YmQ3ZTI2YmNhYjk5NTExMWM1NDNj
+    Mjg2YjIwOWYxNDQ1YTFlODcyNjEwOWUzMGQ0MjViNjJiZDU5N2MzZWFmNDNh
+    YjkxOGQ3NDI1ZWZjMTMzZWVlMjY0NmUyY2Q2NWYyMzdkMDNjMTM=

data/app/controllers/resource_controller.rb

@@ -49,9 +49,9 @@ class ResourceController < UmlautController
     render(:text => remote_response.read)
   rescue Timeout::Error, Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
     msg                = "#{e.inspect}: waiting for image proxy from `#{url_str}`; timeout is currently set to #{HttpTimeout}s; returning broken image"
-    relevant_backtrace = e.backtrace.find_all {|line| line =~ /umlaut/}
+    backtrace          = Umlaut::Util.clean_backtrace(e)
 
-    logger.warn("#{msg}\n  #{relevant_backtrace.join("\n  ")}")
+    logger.warn("#{msg}\n  #{backtrace.join("\n  ")}")
 
     response.headers['X-Original-Url'] = url_str
     render :text => msg, :status => 504

data/app/controllers/umlaut/error_handling.rb

@@ -36,8 +36,8 @@ module Umlaut::ErrorHandling
 
   def log_error_with_context(exception, severity = :fatal)
     message = "\n#{exception.class} (#{exception.message}):\n"
-    message << "  uri: #{request.fullpath}\n\n"
-    message << "  params: #{params.inspect}\n\n"
+    message << "  uri: #{request.fullpath}\n"
+    message << "  params: #{params.inspect}\n"
     message << "  Referer: #{request.referer}\n" if request.referer
     message << "  User-Agent: #{request.user_agent}\n"
     message << "  Client IP: #{request.remote_addr}\n\n"

data/app/models/collection.rb

@@ -142,7 +142,7 @@ class Collection
         # and logged to db as well as logfile if possible, only bugs in ServiceWave
         # itself should wind up caught here.
         Thread.current[:exception] = e
-        logger.error("Background Service execution exception: #{e}\n\n   " + Rails.backtrace_cleaner.clean(e.backtrace).join("\n"))
+        logger.error("Background Service execution exception: #{e.inspect}\n   " + Umlaut::Util.clean_backtrace(e).join("\n   "))
 
         # One exception is in test environment, when we may be intentionally
         # trying to get exceptions to propagate up from ServiceWave to here,

data/app/models/referent.rb

@@ -244,6 +244,10 @@ class Referent < ActiveRecord::Base
   def oclcnum
     return get_oclcnum(self)
   end
+
+  def doi
+    return get_doi(self)
+  end
   
   # Creates an OpenURL::ContextObject assembling all the data in this
   # referrent. 
@@ -351,6 +355,10 @@ class Referent < ActiveRecord::Base
     if key == "journal" && metadata['atitle'].present?
       key = 'article'
     end
+
+    if key == "book" && metadata['atitle'].present?
+      key = "bookitem"
+    end
     
     label = I18n.t(key, :scope => "umlaut.citation.genre", :default => "")
     label = nil if label.blank?

data/app/models/service_wave.rb

@@ -163,13 +163,7 @@ class ServiceWave
   
   protected
     def clean_backtrace(exception)
-      if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
-        trace = Rails.backtrace_cleaner.clean(exception.backtrace)
-        trace = Rails.backtrace_cleaner.clean(exception.backtrace, :all) if trace.empty?
-        return trace
-      else
-        return exception.backtrace
-      end
+      Umlaut::Util.clean_backtrace(exception)
     end
 
   

data/app/service_adaptors/amazon.rb

@@ -277,8 +277,9 @@ class Amazon < Service
         end
 
       end
-			# Enhance with full author name string even if aulast is already present, because full string may be useful for worldcat identities. 
-      unless (metadata['au'] )
+
+      # Don't overwrite aulast with our full au
+      unless (metadata['au'] || metadata['aulast'])
         if author = (item_attributes.at("Author"))
           request.referent.enhance_referent('au', author.inner_text)
         end

data/app/service_adaptors/isbn_link.rb

@@ -28,7 +28,10 @@ class IsbnLink < Service
   def handle(umlaut_request)
     
     isbn = get_isbn(umlaut_request.referent)
-    
+
+    # remove hyphens, some services don't like them.
+    isbn = isbn.gsub('-', '') if isbn.present?
+  
     # No isbn, nothing we can do. 
     return umlaut_request.dispatched(self, true) if isbn.blank?
 

data/app/service_adaptors/sfx.rb

@@ -100,7 +100,7 @@ class Sfx < Service
     return @base_url
   end
 
-  def handle(request)
+  def handle(request)      
     client = self.initialize_client(request)
     begin
       response = self.do_request(client)
@@ -256,13 +256,11 @@ class Sfx < Service
 
 
         # Okay, keep track of best fit ctx for metadata enhancement
-        if request.referent.format == "journal"
-          if ( umlaut_service == 'fulltext')
-            best_fulltext_ctx = perl_data
-            best_nofulltext_ctx = nil
-          elsif best_nofulltext_ctx == nil
-            best_nofulltext_ctx = perl_data
-          end
+        if ( umlaut_service == 'fulltext')
+          best_fulltext_ctx = perl_data
+          best_nofulltext_ctx = nil
+        elsif best_nofulltext_ctx == nil
+          best_nofulltext_ctx = perl_data
         end
 
         if ( umlaut_service ) # Okay, it's in services or targets of interest
@@ -399,7 +397,9 @@ class Sfx < Service
          :service_type_value => "highlighted_link")
     end
 
+
     # Did we find a ctx best fit for enhancement?
+
     if best_fulltext_ctx
       enhance_referent(request, best_fulltext_ctx)
     elsif best_nofulltext_ctx
@@ -673,15 +673,18 @@ class Sfx < Service
   # Second argument is a Nokogiri element representing the <perldata>
   # tag and children.
   def enhance_referent(request, perl_data)
+
+
     ActiveRecord::Base.connection_pool.with_connection do
       metadata = request.referent.metadata
 
       sfx_co = Sfx.parse_perl_data(perl_data)
 
       sfx_metadata = sfx_co.referent.metadata
+
       # Do NOT enhance for metadata type 'BOOK', unreliable matching from
-      # SFX!
-      return if sfx_metadata["object_type"] == "BOOK" || sfx_metadata["genre"] == "book"
+      # SFX! UNLESS we requested based on a DOI or ISBN, that's reliable. 
+      return if request.referent.isbn.blank? && request.referent.doi.blank? && (sfx_metadata["object_type"] == "BOOK" || sfx_metadata["genre"] == "book")
 
       # If we already had metadata for journal title and the SFX one
       # differs, we want to over-write it. This is good for ambiguous

data/lib/umlaut.rb

@@ -1,4 +1,6 @@
+require 'umlaut/version'
 require 'umlaut/routes'
+require 'umlaut/util'
 
 # not sure why including openurl gem doesn't do the require, but it
 # seems to need this. 

data/lib/umlaut/util.rb

@@ -0,0 +1,24 @@
+module Umlaut
+  module Util
+
+    module_function
+
+    # Provide a prettified and cleaned exception backtrace array from an exception,
+    # using the Rails backtrace cleaner, as configured in the app. Umlaut configures
+    # it, in an initializer declared in umlaut.rb, to prettify and include Umlaut trace lines. 
+    #
+    # This will produce a stack trace similar to what Rails logs by default for uncaught
+    # exceptions. We use it for exception logging in several places. 
+    #
+    # Pass in the exception itself, not `exception.backtrace`. 
+    def clean_backtrace(exception)
+      if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
+        trace = Rails.backtrace_cleaner.clean(exception.backtrace)
+        trace = Rails.backtrace_cleaner.clean(exception.backtrace, :all) if trace.empty?
+        return trace
+      else
+        return exception.backtrace
+      end
+    end
+  end
+end

data/lib/umlaut/version.rb

@@ -1,5 +1,5 @@
 module Umlaut
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 
   # This is used in Umlaut's .gemspec for generating the gem,
   # and is also used in the umlaut app generator to make sure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Jonathan Rochkind, et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -509,6 +509,7 @@ files:
 - lib/truncate_to_db_limit.rb
 - lib/umlaut.rb
 - lib/umlaut/routes.rb
+- lib/umlaut/util.rb
 - lib/umlaut/version.rb
 homepage: https://github.com/team-umlaut/umlaut
 licenses: []