umlaut 3.0.2 → 3.0.3

data/app/models/referent.rb

@@ -51,7 +51,9 @@ class Referent < ActiveRecord::Base
       # Apply referent filters
       rfr_id = ""
       rfr_id = co.referrer.identifier if (co.referrer && ! co.referrer.identifier.blank?)
-      UmlautController.umlaut_config.lookup!("referent_filters", []).each do |regexp, filter|
+      UmlautController.umlaut_config.lookup!("referent_filters", []).each do |filter_config|
+        regexp = filter_config[:match]
+        filter = filter_config[:filter]
         if (regexp =~ rfr_id)
           filter.filter(rft) if filter.respond_to?(:filter)
         end

data/lib/service_adaptors/blacklight.rb

@@ -93,7 +93,7 @@ class Blacklight < Service
     #keyword search.    
     if (@keyword_search &&
         url = blacklight_keyword_search_url(request))
-        
+            
         doc = Nokogiri::XML( http_fetch(url).body )
         # filter out matches whose titles don't really match at all, or
         # which have already been seen in identifier search. 

data/lib/service_adaptors/sfx.rb

@@ -323,8 +323,11 @@ class Sfx < Service
           # Sfx metadata we want
           response_data[:sfx_base_url] = @base_url
           response_data[:sfx_obj_index] = sfx_obj_index + 1 # sfx is 1 indexed
-          response_data[:sfx_target_index] = target_index + 1 
-          response_data[:sfx_request_id] = (perl_data/"//hash/item[@key='sfx.request_id']").first.inner_text
+          response_data[:sfx_target_index] = target_index + 1
+          # sometimes the sfx.request_id is missing, go figure. 
+          if request_id = (perl_data/"//hash/item[@key='sfx.request_id']").first
+            response_data[:sfx_request_id] = request_id.inner_text
+          end
           response_data[:sfx_target_service_id] = target_service_id
           response_data[:sfx_target_name] = sfx_target_name
           # At url-generation time, the request isn't available to us anymore,
@@ -453,6 +456,12 @@ class Sfx < Service
       key = item['key'].to_s
             
       value = item.inner_text
+      
+      # SFX sometimes returns invalid UTF8 (is it really ISO 8859? Is it
+      # predictable? Who knows. If it's not valid, it'll cause all
+      # sorts of problems later. So if it's not valid, we're just
+      # going to ignore it, sorry. 
+      next unless value.valid_encoding?
 
       # Some normalization. SFX uses rft.year, which is not actually
       # legal. Stick it in rft.date instead.
@@ -482,7 +491,7 @@ class Sfx < Service
       # But this still has HTML entities in it sometimes. Now we've
       # got to decode THAT.
       # TODO: Are we sure we need to do this? We need an example
-      # from SFX result to test, it's potentially expensive. 
+      # from SFX result to test, it's potentially expensive.       
       value = html_ent_coder.decode(value)
 
       # object_type? Fix that to be the right way.

data/lib/umlaut/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-08-21 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: 3369968520259252587
+      hash: -1929703717396747492
 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: 3369968520259252587
+      hash: -1929703717396747492
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24