umlaut 4.1.0.pre.2 → 4.1.0.pre3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NThjZGZmNjFlZTgwNGVjMjg0MjJkODAwNWI4NjRiYzRjNmNlNGY5OQ==
+    YWI3ZDMwMWJhNWJjMTAxZTE5NzE5MjcwNTU0M2YxN2NmN2MzODI2MQ==
   data.tar.gz: !binary |-
-    OGQ0MGRlYzJiNmViZTQxMDQ4Y2U4MWYzOWY3MjljOWQwMWVjYmRlZQ==
+    YzU1M2E1NWJlNjc4NmQzNDA3ZGJmMDk3NDI0MWM4N2IzNGZlMmNhMg==
 SHA512:
   metadata.gz: !binary |-
-    ZGI4Njk3ZmExYzljNDcwMTMzZjA5YWQ3NTYyOGY1YWYyYTZmZjNlNTAxNDAz
-    MWYyNmZkYmJiNGEwYWViNTQ4ZDA4OWY2OGQ2MTA4ZGZiYjZkYzU5ZDEzZWQx
-    YWY3OTYwOGJiZmU4MzU5ZTJhODgzMThjOTRjNmNlMmZhOGI0NjA=
+    ZTNkMGY2OWQzODRiMDE1MGQ3MjA3YjJlNGNkYjhlODMyYmFmNmI5OTY4OTBm
+    NzcyYTIwYTI4YmRhMzQ1ZDRjOTE5ZTA3OTVkNDBlM2I1MTgyMWMzOTFjMjg1
+    NTczYTAwNmFkODhkNjI2YzgwMjcxMzM5MzUxNTYxOWQ4NDM0MGU=
   data.tar.gz: !binary |-
-    NTlkNWFhNDgxMjk1MWFkYWJiZGE1ZjQ5OGE2YWJkNzc2YmIwODhiODNjMTRk
-    NmU5ODU2YTIwMWFmMDQwNGQxNTRhOGNmODFmNzVkMmU5MzcxMDM0OGYxODgx
-    ZTQ0ZGI1MjE0ZmQ3ZmIzMzFmNWMyMDNhZjgyMzhhOWNmY2I2ODI=
+    NzkwNTBiZWNhMTdlMDBmYzkxNWIyZDVmOGM2N2U5NmJiMTAwMWJhZTE4M2M0
+    NmUxOTcwNTBjM2YyZDQ2YzI5MThiZWIwMDRlZDg1YzZkN2EzN2ZmNmQyMDJm
+    ZDExMGJmYzNkYTk4NDhhYTk1NmNmODJkMDliMGJhZjE0ZWU2MjI=

data/Rakefile

@@ -20,7 +20,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
@@ -33,7 +34,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-require 'single_test'
-SingleTest.load_tasks
-
 task :default => :test

data/app/controllers/search_controller.rb

@@ -98,11 +98,13 @@ class SearchController < UmlautController
       # If we narrowed down to one result redirect
       # to resolve action.
       redirect_to( url_for_with_co({:controller => 'resolve'}, @display_results[0]) )
-    elsif (@display_results.length == 0)
-      # 0 hits, do it too.
+    elsif (@display_results.length == 0) && (umlaut_config.lookup!("search.display_zero_hit_results") != true)
+      # If we have 0 hits, also redirect to resolve, unless config tells
+      # us not to.
       redirect_to(  url_for_with_co({:controller => 'resolve'}, @search_context_object) )
     end
-    @page_title = 'Journal titles that '
+
+    @page_title = @display_results.length > 0 ? 'Journal titles that ' : 'No journal titles found that '
     @page_title +=
       (params["umlaut.title_search_type"] == "begins") ?
         'begin with ' : 'contain '

data/app/controllers/umlaut_controller.rb

@@ -90,6 +90,12 @@ class UmlautController < ApplicationController
 
         # can set to "_blank" etc.
         # result_link_target nil
+
+        # On 0 hits from search screen, ordinarily we redirect to resolve
+        # screen becuase Resolve might be able to provide other useful
+        # services such as ILL or backed by other KB's. But to instead
+        # display a "no results" page, set:
+        # display_zero_hit_results true
       end
 
       # config only relevant to SFX use

data/app/service_adaptors/sfx.rb

@@ -36,12 +36,21 @@
 #     relationships, set to empty array [] to eliminate defaults.
 # sfx_timeout: in seconds, for both open/read timeout value for SFX connection.
 #          Defaults to 8.
+# boost_targets: ARRAY of STRINGS containing SFX target names in the form of
+#      "HIGHWIRE_PRESS_JOURNALS". Any target names listed here will be floated to 
+#      the top of the full-text results list. You can end your boosted target
+#      in a "*" to wildcard: "EBSCOHOST_*". 
+# sink_targets: ARRAY of STRINGS containing SFX target names in the form of
+#      "HIGHWIRE_PRESS_JOURNALS". Any target names listed here will be floated to 
+#      the bottom of the full-text results list. You an end your sunk target
+#      in a "*" to wildcard: "EBSCOHOST_*". 
 # roll_up_prefixes: ARRAY of STRINGs, prefixes like "EBSCOHOST_". If multiple
 #      targets sharing one of the specified prefixes are supplied from SFX,
 #      they will be "rolled up" and collapsed, just the first one included
 #      in response. For TITLE-LEVEL (rather than article-level) requests,
 #      the roll-up algorithm is sensitive to COVERAGES, and will only suppress
 #      targets that have coverages included in remaining non-suppressed targets.
+#      
 class Sfx < Service
   require 'uri'
   require 'htmlentities'
@@ -232,6 +241,7 @@ class Sfx < Service
 
       # For each target delivered by SFX
       sfx_obj.search("./ctx_obj_targets/target").each_with_index do|target, target_index|
+        
         response_data = {}
 
         # First check @extra_targets_of_interest
@@ -311,7 +321,7 @@ class Sfx < Service
               next
             end
 
-            related_note = "This version provided from related title:  <em>" + CGI.unescapeHTML( title ) + "</em>.\n"
+            related_note = "May be available under related title:  <em>" + CGI.unescapeHTML( title ) + "</em>.\n"
           end
 
           if ( sfx_service_type == 'getDocumentDelivery' )
@@ -377,6 +387,8 @@ class Sfx < Service
     end
 
     if response_queue["fulltext"].present?
+      response_queue["fulltext"] = sort_sunk_responses(response_queue["fulltext"])
+      response_queue["fulltext"] = sort_boosted_responses(response_queue["fulltext"])
       response_queue["fulltext"] = roll_up_responses(response_queue["fulltext"], :coverage_sensitive => request.title_level_citation? )
     end
 
@@ -517,6 +529,45 @@ class Sfx < Service
     return list
   end
 
+  def sort_boosted_responses(list)
+    return list unless @boost_targets.present?
+
+    preferred = []
+    other_targets = list
+
+    @boost_targets.each do |spec|
+      (picked, other_targets) = other_targets.partition do |a| 
+        if spec.end_with?("*")
+          a[:sfx_target_name] && a[:sfx_target_name].start_with?(spec[0..-2])
+        else
+          spec == a[:sfx_target_name] 
+        end
+      end
+
+      preferred.concat picked
+    end
+            
+    return preferred + other_targets
+  end
+
+  def sort_sunk_responses(list)
+    return list unless @sink_targets.present?
+    
+    sunk = []
+    other_targets = list
+    @sink_targets.each do |spec|
+      (picked, other_targets) = other_targets.partition do |a| 
+        if spec.end_with?("*")
+          a[:sfx_target_name] && a[:sfx_target_name].start_with?(spec[0..-2])
+        else
+          spec == a[:sfx_target_name] 
+        end
+      end
+      sunk.concat picked
+    end
+            
+    return other_targets + sunk
+  end
 
   def sfx_click_passthrough
     # From config, or default to false.
@@ -726,5 +777,4 @@ class Sfx < Service
     return display
   end
 
-  end
-
+end

data/app/views/search/journal_search.html.erb

@@ -34,7 +34,7 @@
 <% unless @hits == 0%>
   <h3><%= t( 'umlaut.search.showing_results', start: @start_result_num, until:  @end_result_num, total: @hits) %></h3>
 <% end %>
-<% if params["rft.jtitle"] %>
+<% if params["rft.jtitle"] && (@display_results.size > 0) %>
   <div class="note"><em><strong><%= t 'umlaut.search.note' %>:</strong> <%= t 'umlaut.search.other_titles_might' %> </em></div>
 <% end %>
 <div class='umlaut-pagination pagination'>

data/lib/umlaut/version.rb

@@ -1,5 +1,5 @@
 module Umlaut
-  VERSION = "4.1.0.pre.2"
+  VERSION = "4.1.0.pre3"
 
   # 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.1.0.pre.2
+  version: 4.1.0.pre3
 platform: ruby
 authors:
 - Jonathan Rochkind, et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -154,14 +154,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: scrub_rb
   requirement: !ruby/object:Gem::Requirement
@@ -210,20 +216,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
-- !ruby/object:Gem::Dependency
-  name: single_test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement