ebsco-eds 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6540dd6a4557914c9126f0c71ede4b796f24d26cea5434f134e5cbcbdbf23f3
-  data.tar.gz: a1a0f31fa32e934e7a7068d4b21b1ee57bf547ac432a03e02d3fb93590c871d8
+  metadata.gz: a98621f9b0ef365e1fca3f814127d8a1a20ff7fa70113d254c2ff90d33b62777
+  data.tar.gz: 639b960e78cbe5c01aaaefc88b524286371a7c6aca32c9c16dc26e70b99b3b97
 SHA512:
-  metadata.gz: cd6f151c9d6ec779f3bb8dc7cf06dd6950be6ed2e91f4e5cf72cb250603aad08cbb38591b3e06ed0f74de943c4bb8377f4b05f2ed7a0e09a635fff4cb88e9379
-  data.tar.gz: 526d2b6ee244df0d90c1616d30543f4eb1125d4e93bf47cfdd14ed449ca11d89fbe80060b0cbe6f747a530a8f3ff6815df7e26ba23a2c2e655df40e19a98a3e8
+  metadata.gz: 4b50c885e10fd0c126736c69af927e5d69e76eb3af3c3985f63acdcf49c385f9285bbee9bd4185b177d64279ad8778218a665fd51c01efd957113c75431ef0c1
+  data.tar.gz: 848222290962eec5901b0bf0f871e64ed8066a375aea7785a8ca1066ac3d84a03f1f513388886049b33958eeb8d9e4230911b276c6fdac7a13eaffcdf080ace0

data/ebsco-eds.gemspec

@@ -6,8 +6,8 @@ require 'ebsco/eds/version'
 Gem::Specification.new do |spec|
   spec.name          = 'ebsco-eds'
   spec.version       = EBSCO::EDS::VERSION
-  spec.authors       = ['Bill McKinney','Eric Frierson']
-  spec.email         = ['bmckinney@ebsco.com, efrierson@ebsco.com']
+  spec.authors       = ['Madeline Dale','Eric Frierson']
+  spec.email         = ['mdale@ebsco.com, efrierson@ebsco.com']
   spec.summary       = 'Summary: EBSCO EDS API'
   spec.description   = 'Description: EBSCO EDS API'
   spec.homepage      = 'https://github.com/ebsco/edsapi-ruby'

data/lib/ebsco/eds/configuration.rb

@@ -59,7 +59,8 @@ module EBSCO
             :ris_link_find => '',
             :ris_link_replace => '',
             :ris_db_find => '',
-            :ris_db_replace => ''
+            :ris_db_replace => '',
+            :smarttext_failover => false
         }
         @valid_config_keys = @config.keys
       end

data/lib/ebsco/eds/results.rb

@@ -29,7 +29,7 @@ module EBSCO
 
       # Creates search results from the \EDS API search response. It includes information about the results and a list
       # of Record items.
-      def initialize(search_results, eds_config = {}, additional_limiters = {}, options = {})
+      def initialize(search_results, eds_config = {}, additional_limiters = {}, options = {}, smarttext_failover = false)
 
         @results = search_results
 
@@ -103,6 +103,9 @@ module EBSCO
           # titleize facets
           @titleize_facets = %w[Language Journal SubjectEDS SubjectGeographic Publisher]
 
+          # set flag that query was rerun with smarttext after no results were found
+          @smarttext_failover = smarttext_failover
+
         else
           # response isn't a hash (eg, html error page)
           raise EBSCO::EDS::ApiError, 'EBSCO API error: Query failed.'

data/lib/ebsco/eds/session.rb

@@ -243,11 +243,15 @@ module EBSCO
             if @search_options.nil? || !add_actions
               @search_options = EBSCO::EDS::Options.new(options, @info)
             end
-
             _response = do_request(:post, path: '/edsapi/rest/Search', payload: @search_options)
             @search_results = EBSCO::EDS::Results.new(_response, @config,
                                                       @info.available_limiters, options)
-
+            if @search_results.stat_total_hits.to_i == 0 && @config[:smarttext_failover] == true
+              @search_options.add_actions('SetSearchMode(smart)', @info)
+              _response = do_request(:post, path: '/edsapi/rest/Search', payload: @search_options)
+              @search_results = EBSCO::EDS::Results.new(_response, @config,
+                                                      @info.available_limiters, options, true)
+            end
             # create temp format facet results if needed
             if options['f']
               if options['f'].key?('eds_publication_type_facet')
@@ -480,9 +484,13 @@ module EBSCO
           list.each.with_index(1) { |id, index|
             dbid = id.split('__',2).first
             accession = id.split('__',2).last
-            current_rec = retrieve(dbid: dbid, an: accession, highlight: highlight, ebook: @config[:ebook_preferred_format])
-            current_rec.eds_result_id = index
-            records.push current_rec
+            begin
+              current_rec = retrieve(dbid: dbid, an: accession, highlight: highlight, ebook: @config[:ebook_preferred_format])
+              current_rec.eds_result_id = index
+              records.push current_rec
+            rescue EBSCO::EDS::BadRequest, EBSCO::EDS::NotFound => e
+              puts "Request for #{id} in #{self.class.name}#solr_retrieve_list failed with #{e}" if @debug
+            end
           }
         end
         r = empty_results(records.length)
@@ -1261,4 +1269,4 @@ module EBSCO
 
     end
   end
-end
+end

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '1.0.9'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
-- Bill McKinney
+- Madeline Dale
 - Eric Frierson
 autorequire: 
 bindir: exe
@@ -371,7 +371,7 @@ dependencies:
         version: '3.6'
 description: 'Description: EBSCO EDS API'
 email:
-- bmckinney@ebsco.com, efrierson@ebsco.com
+- mdale@ebsco.com, efrierson@ebsco.com
 executables: []
 extensions: []
 extra_rdoc_files: []