ebsco-eds 0.2.4.pre → 0.2.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17261b862dc61e3ae40c37af9e2295fa8b80535b
-  data.tar.gz: ca92bc59097acbbff9c81bd944c3756e8cbe7502
+  metadata.gz: 9e370c38b63e3ff1410ce4cee4d50394d5f2df67
+  data.tar.gz: d22f2c176ffa0a2f26625a472662b6f9397b052f
 SHA512:
-  metadata.gz: 000f02fb42908901ad9a96f2169a14b307a63729e0f7699560f4e9e051241a75e7e23c25b13e6ab4057f56c19bb3b2829bdaa029a2f8b76d1698b2f6a2760697
-  data.tar.gz: 592205483df11ca0468397da5602f6973ca242625ca80b9399221932dcb9107d6577cfa032f29652fc6550ff0c751e4185b43bfc59c08da03bb522a9feab3674
+  metadata.gz: 35b21cfb0179fe336a2adc0a4a848e184689a0eadd4ebf14900d8d60a90b8d60951df8a361d950a11bdc21c8ee75b2c7e94e1e86337b8de6df26806661670834
+  data.tar.gz: e40c20c649c5a7fb5edddddf461ec34f2a340358f6a7c3f47cb79cc3b86f419af6343900e9ac3a91081d5660387c5a912dc0fb7865114abdac0dabb2630ce95b

data/lib/ebsco/eds/configuration.rb

@@ -34,7 +34,7 @@ module EBSCO
             :use_cache => true,
             :eds_cache_dir => ENV['TMPDIR'] || '/tmp',
             :timeout => 60,
-            :open_timeout => 2
+            :open_timeout => 6
         }
         @valid_config_keys = @config.keys
       end

data/lib/ebsco/eds/options.rb

@@ -22,6 +22,25 @@ module EBSCO
         #   end
         # end
 
+        # blacklight year range slider input
+        # "range"=>{"pub_year_tisim"=>{"begin"=>"1970", "end"=>"1980"}}
+        if options.has_key?('range')
+          if options['range'].has_key?('pub_year_tisim')
+            begin_year = nil
+            end_year = nil
+            if options['range']['pub_year_tisim'].has_key?('begin')
+              begin_year = options['range']['pub_year_tisim']['begin']
+            end
+            if options['range']['pub_year_tisim'].has_key?('end')
+              end_year = options['range']['pub_year_tisim']['end']
+            end
+            unless begin_year.nil? or end_year.nil?
+              pub_year_tisim_range = begin_year + '-01/' + end_year + '-01'
+              @Actions.push "addlimiter(DT1:#{pub_year_tisim_range})"
+            end
+          end
+        end
+
         options.each do |key, value|
 
           case key
@@ -131,8 +150,8 @@ module EBSCO
                 end
               end
 
-              if value.has_key?('eds_publication_year_facet')
-                _list = value['eds_publication_year_facet']
+              if value.has_key?('eds_publication_year_range_facet')
+                _list = value['eds_publication_year_range_facet']
                 _this_year = Date.today.year
                 _this_month = Date.today.month
                 _list.each do |item|
@@ -159,7 +178,12 @@ module EBSCO
                 end
               end
 
-            else
+              if value.has_key?('eds_publication_year_facet')
+                year_list = value['eds_publication_year_facet']
+                year_list.each do |item|
+                  @Actions.push "addfacetfilter(PublicationYear:#{item})"
+                end
+              end
 
           end
         end

data/lib/ebsco/eds/record.rb

@@ -747,7 +747,11 @@ module EBSCO
 
       # dynamically add item metadata as 'eds_extra_ItemNameOrLabel'
       def add_extra_item_accessors(item)
-        key = item['Name'] ? item['Name'] : item['Label'].gsub(/\s+/, '_')
+        key = item['Name'] ? item['Name'].gsub(/\s+/, '_') : item['Label'].gsub(/\s+/, '_')
+        # NumberOther isn't always unique, concatenate the label
+        if key == 'NumberOther' or key == 'Number_Other'
+          key = 'number_other_' + item['Label'].gsub(/\s+/, '_')
+        end
         value = item['Data']
         unless key.nil?
           key = "eds_extras_#{key}"

data/lib/ebsco/eds/results.rb

@@ -130,7 +130,9 @@ module EBSCO
         eds_library_location_facet = solr_facets('LocationLibrary')
         eds_library_collection_facet = solr_facets('CollectionLibrary')
         eds_author_university_facet = solr_facets('AuthorUniversity')
-        eds_publication_year_facet = solr_pub_date_facets
+        eds_publication_year_range_facet = solr_pub_date_facets
+        eds_publication_year_facet = solr_facets('PublicationYear')
+        eds_pub_year_tisim = solr_facets('PublicationYear')
         facet = true
 
         # solr response
@@ -163,6 +165,7 @@ module EBSCO
                         'eds_language_facet' => eds_language_facet,
                         'eds_subject_topic_facet' => eds_subject_topic_facet,
                         'eds_publication_year_facet' => eds_publication_year_facet,
+                        'eds_publication_year_range_facet' => eds_publication_year_range_facet,
                         'eds_publisher_facet' => eds_publisher_facet,
                         'eds_journal_facet' => eds_journal_facet,
                         'eds_subjects_geographic_facet' => eds_subjects_geographic_facet,
@@ -170,7 +173,8 @@ module EBSCO
                         'eds_content_provider_facet' => eds_content_provider_facet,
                         'eds_library_location_facet' => eds_library_location_facet,
                         'eds_library_collection_facet' => eds_library_collection_facet,
-                        'eds_author_university_facet' => eds_author_university_facet
+                        'eds_author_university_facet' => eds_author_university_facet,
+                        'pub_year_tisim' => eds_pub_year_tisim
                     }
                 }
         }

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.2.4.pre'
+    VERSION = '0.2.5.pre'
   end
 end

metadata

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