ebsco-eds 0.3.13.pre → 0.3.14.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e860b62850669e12c05428b96cf60813ac78c8
-  data.tar.gz: 4554be6442500a21b804a15a2deebfbe33813344
+  metadata.gz: e2cd745f89b12f16e7db05e16bb5ad97d3545e68
+  data.tar.gz: 77c9f067970412617da0219fc60acf1e395d302e
 SHA512:
-  metadata.gz: 8343edbc0a89f8f06a1a7e39ef0dfbc5da128fd2f18f113bde79e9b72f2a8beeca2697145cacd475a3fe59476c93b50a9bc4a705e21ec765af39aef04ba4a1a3
-  data.tar.gz: cca4e95649cca637ea8cdbdc00394c07bb016d50005d0a1420f820261a12b9004dc240bc119551188dfeda5551f0e9c647df765ef5f2ebc2443b650fa6339186
+  metadata.gz: e62963cfd798ac3b22c24d331db5fa4512f928eb124ee0a7ca6dbcd1fb2029e550e913e6c86f625ee2380d06402855296733b348fa02c0d74bfd2666a2243d37
+  data.tar.gz: eb3e9b97eeb05a9d7a286b96b31d4e6ebf9caed16e23d0037d8425988824f5ee3007499e474026759fb94637a06c555013099a5838fdf60f04da23ab0fa0e410

data/lib/ebsco/eds/options.rb

@@ -181,7 +181,7 @@ module EBSCO
         _my_limiters = []
 
         @FacetFilters = []
-        _my_filters = {'FilterId' => 1, 'FacetValues' => []}
+        filter_id = 1
 
         @RelatedContent = info.default_related_content_types
         _my_related_content = []
@@ -373,20 +373,13 @@ module EBSCO
                 end
               end
 
-              # SourceType
-              if value.has_key?('eds_publication_type_facet')
-                f_list = value['eds_publication_type_facet']
-                f_list.each do |item|
-                  item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'SourceType', 'Value' => item})
-                end
-              end
               # Language
               if value.has_key?('eds_language_facet')
                 lang_list = value['eds_language_facet']
                 lang_list.each do |item|
                   item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'Language', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'Language', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
               # SubjectEDS
@@ -394,7 +387,8 @@ module EBSCO
                 subj_list = value['eds_subject_topic_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'SubjectEDS', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'SubjectEDS', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
               # SubjectGeographic
@@ -402,7 +396,8 @@ module EBSCO
                 subj_list = value['eds_subjects_geographic_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'SubjectGeographic', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'SubjectGeographic', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
               # Publisher
@@ -410,7 +405,8 @@ module EBSCO
                 subj_list = value['eds_publisher_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'Publisher', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'Publisher', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
               # Journal
@@ -418,7 +414,8 @@ module EBSCO
                 subj_list = value['eds_journal_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'Journal', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'Journal', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
               # Category
@@ -426,15 +423,8 @@ module EBSCO
                 subj_list = value['eds_category_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'Category', 'Value' => item})
-                end
-              end
-              # ContentProvider
-              if value.has_key?('eds_content_provider_facet')
-                subj_list = value['eds_content_provider_facet']
-                subj_list.each do |item|
-                  item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'ContentProvider', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'Category', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
               # LocationLibrary
@@ -442,7 +432,8 @@ module EBSCO
                 subj_list = value['eds_library_location_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'LocationLibrary', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'LocationLibrary', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
               # CollectionLibrary
@@ -450,7 +441,8 @@ module EBSCO
                 subj_list = value['eds_library_collection_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'CollectionLibrary', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'CollectionLibrary', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
               # AuthorUniversity
@@ -458,17 +450,39 @@ module EBSCO
                 subj_list = value['eds_author_university_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
-                  _my_filters['FacetValues'].push({'Id' => 'AuthorUniversity', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'AuthorUniversity', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
               # PublicationYear
               if value.has_key?('eds_publication_year_facet')
                 year_list = value['eds_publication_year_facet']
                 year_list.each do |item|
-                  _my_filters['FacetValues'].push({'Id' => 'PublicationYear', 'Value' => item})
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'PublicationYear', 'Value' => item}]})
+                  filter_id += 1
                 end
               end
 
+              # Special Cases:
+
+              # SourceType
+              if value.has_key?('eds_publication_type_facet')
+                f_list = value['eds_publication_type_facet']
+                f_list.each do |item|
+                  item = eds_sanitize item
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'SourceType', 'Value' => item}]})
+                  filter_id += 1
+                end
+              end
+              # ContentProvider
+              if value.has_key?('eds_content_provider_facet')
+                subj_list = value['eds_content_provider_facet']
+                subj_list.each do |item|
+                  item = eds_sanitize item
+                  @FacetFilters.push({'FilterId' => filter_id, 'FacetValues' => [{'Id' => 'ContentProvider', 'Value' => item}]})
+                  filter_id += 1
+                end
+              end
 
             # ====================================================================================
             # limiters
@@ -530,11 +544,6 @@ module EBSCO
 
         end # end options parsing
 
-        # set solr facet filters, if any
-        if _my_filters['FacetValues'].length > 0
-          @FacetFilters = [_my_filters]
-        end
-
         # set solr limiters, if any
         @Limiters = _my_limiters
 

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.3.13.pre'
+    VERSION = '0.3.14.pre'
   end
 end

metadata

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