ebsco-eds 0.2.1.pre → 0.2.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a25ab8a3564b039177b6e8e31643b8c493c848
-  data.tar.gz: 52f896544dbe0b8a99ca7510d08f9af73dc35330
+  metadata.gz: 97b036a83e87b1af85d6424ed5aaef1781aba884
+  data.tar.gz: b3b3b67d66a6a2f1e8c154e5c0a0cd290531306c
 SHA512:
-  metadata.gz: baead98ec09d3201c15268a022d85e6a24ca540d4423983a1ffcebff4cc26c1dc003e428d16fd667ca0b2f555bacc160c69c59231f68215114b5a54eb49935a6
-  data.tar.gz: 90c110da70bada5e6c91d78b4171733755ef25e834579a7f2b97cb53fecbdd2f8729e1325422042418a85bbf341fa2cc81ee234d0efe3e9870883c17296aad3a
+  metadata.gz: 2cd3f042e79b6f5f047a3863f667f3905230d46d05b05fba79045f5d4af4b37946929617184492db5abb9e448159bd2cbe0fa6fcc04606527621f9b6b94d21be
+  data.tar.gz: 77dcc0ba8ae3bba625908b424d0da343373e10e7e6ba0fda6aa2b055cb1a314954d7913e1426ecad73a862acad9262fa98a378a960719b0fbb511bbabb93f068

data/.env.test

@@ -1,6 +1,7 @@
-EDS_PROFILE=edsapi
-EDS_USER=user
-EDS_PASS=secret
+EDS_PROFILE=eds-api
+EDS_USER=billmckinn
+EDS_PASS=4n~r1me86y
 EDS_AUTH=user
 EDS_GUEST=n
-EDS_ORG=none
+EDS_ORG=none
+EDS_DEBUG=false

data/lib/ebsco/eds/info.rb

@@ -79,6 +79,10 @@ module EBSCO
         @available_search_criteria.fetch('AvailableLimiters',{}).select{|item| item['DefaultOn'] == 'y'}.map{|hash| hash['Id']}
       end
 
+      def default_limiter_labels
+        @available_search_criteria.fetch('AvailableLimiters',{}).select{|item| item['DefaultOn'] == 'y'}.map{|hash| hash['Label']}
+      end
+
       def available_limiters (id = 'all')
         if id == 'all'
           @available_search_criteria.fetch('AvailableLimiters',{})
@@ -87,6 +91,10 @@ module EBSCO
         end
       end
 
+      def available_limiter_labels
+        @available_search_criteria.fetch('AvailableLimiters',{}).map{|hash| hash['Label']}
+      end
+
       # get an array of limiter values for a Type=multiselectvalue limiter
       def available_limiter_values (id)
         _limiter = @available_search_criteria.fetch('AvailableLimiters',{}).find{|item| item['Id'] == id}
@@ -95,6 +103,10 @@ module EBSCO
         end
       end
 
+      def get_limiter_by_label (label)
+        @available_search_criteria.fetch('AvailableLimiters',{}).find{|item| item['Label'] == label}
+      end
+
       # ====================================================================================
       # RELATED CONTENT
       # ====================================================================================

data/lib/ebsco/eds/options.rb

@@ -15,6 +15,13 @@ module EBSCO
   
         @Actions = []
 
+        # add DefaultOn=y Type=select limiters
+        # info.available_limiters.each do |limiter|
+        #   if limiter['DefaultOn'] == 'n' and limiter['Type'] == 'select'
+        #     @Actions.push "addLimiter(#{limiter['Id']}:y)"
+        #   end
+        # end
+
         options.each do |key, value|
 
           case key
@@ -111,18 +118,16 @@ module EBSCO
                 end
               end
 
+              # translate solr search limiters into EDS API addLimiter calls
+              # matches are determined by the limiter labels passed in by solr
+              _search_limiter_list = []
               if value.has_key?('eds_search_limiters_facet')
-                _list = value['eds_search_limiters_facet']
-                _list.each do |item|
-                  if item == 'Full Text'
-                    @Actions.push "addlimiter(FT:y)"
-                  end
-                  if item == 'Peer Reviewed'
-                    @Actions.push "addlimiter(RV:y)"
-                  end
-                  if item == 'Available in Library Collection'
-                    @Actions.push "addlimiter(FT1:y)"
-                  end
+                _search_limiter_list = value['eds_search_limiters_facet']
+              end
+              info.available_limiters.each do |limiter|
+                # only handle 'select' limiters (ones with values of 'y' or 'n')
+                if _search_limiter_list.include? limiter['Label'] and limiter['Type'] == 'select'
+                  @Actions.push "addLimiter(#{limiter['Id']}:y)"
                 end
               end
 

data/lib/ebsco/eds/results.rb

@@ -237,12 +237,22 @@ module EBSCO
         search_limiters = []
         if stat_total_hits.to_i > 0
           if @limiters.any?
-            # _ft_limiter = @limiters.find{|item| item['Id'] == 'FT'}
-            # _rv_limiter = @limiters.find{|item| item['Id'] == 'RV'}
-            # _ft1_limiter = @limiters.find{|item| item['Id'] == 'FT1'}
-            search_limiters.push('Full Text').push('')
-            search_limiters.push('Peer Reviewed').push('')
-            search_limiters.push('Available in Library Collection').push('')
+            _ft_limiter = @limiters.find{|item| item['Id'] == 'FT'}
+            unless _ft_limiter.nil?
+              search_limiters.push(_ft_limiter['Label']).push('')
+            end
+            _rv_limiter = @limiters.find{|item| item['Id'] == 'RV'}
+            unless _rv_limiter.nil?
+              search_limiters.push(_rv_limiter['Label']).push('')
+            end
+            _ft1_limiter = @limiters.find{|item| item['Id'] == 'FT1'}
+            unless _ft1_limiter.nil?
+              search_limiters.push(_ft1_limiter['Label']).push('')
+            end
+            _fr_limiter = @limiters.find{|item| item['Id'] == 'FR'}
+            unless _fr_limiter.nil?
+              search_limiters.push(_fr_limiter['Label']).push('')
+            end
           end
         end
         search_limiters

data/lib/ebsco/eds/session.rb

@@ -256,7 +256,7 @@ module EBSCO
         record
       end
 
-      # Create a result set with just the record before and after then index item
+      # Create a result set with just the record before and after the current detailed record
       def solr_retrieve_previous_next(options = {})
         records = []
         hits = search(options).stat_total_hits

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.2.1.pre'
+    VERSION = '0.2.2.pre'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 0.2.1.pre
+  version: 0.2.2.pre
 platform: ruby
 authors:
 - Bill McKinney
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday