ebsco-eds 0.2.6.pre → 0.2.7.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfd407ab03719f2a750c7f1ce0e2be15b66a4881
-  data.tar.gz: 27459d516520b6d04177b3c3e7a7d62e3f90c64e
+  metadata.gz: 45213f8ec76681800d8faa12c1c3057cef0db0fe
+  data.tar.gz: dc678cf8c0f73da99d72235001594e108156c8a8
 SHA512:
-  metadata.gz: b81e001912a950d9791b6d8e65985fe9a1f4233a28837c3f1d0c4961c6d5386e5c3bae27f658ea588f514c2ee914853f058c33067c7dc8d6276a02243edc593c
-  data.tar.gz: 12a97e2f33bb4daf527df57988404d7d58fef8666993862e0252ea51fe96451d7c2da96c894b048201187175532e47923c275dd8431c3d09cb36c816aeb318d4
+  metadata.gz: fe341931d46051bcb6cb8c4c2d13e283c66024bfd6a25ca4c212bf270f649efc71c88558876e28383ac5ff6a7058bfa977e86d4db12c59fa031d854f27a350d5
+  data.tar.gz: e2b9374d44c4a37379d9d34e7b37702a83e719734ac767059df5167fe3e8fec869b1462660bb07dda347663b488c44f5f5ff644386125ef17219cbbc4b44a2c6

data/lib/ebsco/eds/options.rb

@@ -228,77 +228,8 @@ module EBSCO
       #     false
       #   end
       # end
-
-
-      # query-1=AND,volcano&sort=relevance&includefacets=y&searchmode=all&autosuggest=n&view=brief&resultsperpage=20&pagenumber=1&highlight=y
-      def to_query_string
-        qs = ''
-
-        # SEARCH CRITERIA:
-
-        # query
-        #  if @SearchCriteria.Queries[0].has_key? :BooleanOperator
-        #   qs << 'query=' + @SearchCriteria.Queries[0][:BooleanOperator]
-        # else
-        #   qs << 'query=AND'
-        # end
-        # if @SearchCriteria.Queries[0].has_key? :FieldCode
-        #   qs << ',' + @SearchCriteria.Queries[0][:FieldCode]
-        # end
-        qs << 'query=' + @SearchCriteria.Queries[0][:Term]
-
-        # mode
-        qs << '&searchmode=' + @SearchCriteria.SearchMode
-
-        # facets
-        qs << '&includefacets=' + @SearchCriteria.IncludeFacets
-
-        # sort
-        qs << '&sort=' + @SearchCriteria.Sort
-
-        # auto-suggest
-        qs << '&autosuggest=' + @SearchCriteria.AutoSuggest
-
-        # limiters
-        unless @SearchCriteria.Limiters.nil?
-          qs << '&limiter=' + @SearchCriteria.Limiters
-        end
-
-        # expanders
-        qs << '&expander=' + @SearchCriteria.Expanders.join(',')
-
-        # facet filters
-        unless @SearchCriteria.FacetFilters.nil?
-          qs << '&facetfilter=1,' + @SearchCriteria.FacetFilters
-        end
-
-        # related content
-        unless @SearchCriteria.RelatedContent.nil?
-          qs << '&relatedcontent=' + @SearchCriteria.RelatedContent.join(',')
-          # TODO: publication ID
-
-          # Retrieval Criteria
-
-          unless @RetrievalCriteria.View.nil?
-            qs << '&view=' + @RetrievalCriteria.View
-          end
-          unless @RetrievalCriteria.ResultsPerPage.nil?
-            qs << '&resultsperpage=' + @RetrievalCriteria.ResultsPerPage.to_s
-          end
-          unless @RetrievalCriteria.PageNumber.nil?
-            qs << '&pagenumber=' + @RetrievalCriteria.PageNumber.to_s
-          end
-          unless @RetrievalCriteria.Highlight.nil?
-            qs << '&highlight=' + @RetrievalCriteria.Highlight
-          end
-
-          qs
-        end
-      end
-
-
-
-      end
+  
+    end
   
     class SearchCriteria
       include JSONable
@@ -355,6 +286,8 @@ module EBSCO
                     _field_code = 'IS'
                   when 'isbn'
                     _field_code = 'IB'
+                  when 'descriptor'
+                    _field_code = 'DE'
                 end
               end
 

data/lib/ebsco/eds/session.rb

@@ -195,8 +195,7 @@ module EBSCO
           if @search_options.nil?
             @search_results = EBSCO::EDS::Results.new(empty_results)
           else
-            #_response = do_request(:post, path: @config[:search_url], payload: @search_options)
-            _response = do_request(:get, path: @config[:search_url], payload: @search_options)
+            _response = do_request(:post, path: @config[:search_url], payload: @search_options)
             @search_results = EBSCO::EDS::Results.new(_response, @info.available_limiters, options)
             @current_page = @search_results.page_number
             @search_results
@@ -208,10 +207,8 @@ module EBSCO
             # create/recreate the search options if nil or not passing actions
             if @search_options.nil? || !add_actions
               @search_options = EBSCO::EDS::Options.new(options, @info)
-              puts 'OPTIONS AS QUERY STRING: ' + @search_options.to_query_string
             end
-            #_response = do_request(:post, path: @config[:search_url], payload: @search_options)
-            _response = do_request(:get, path: @config[:search_url], payload: @search_options)
+            _response = do_request(:post, path: @config[:search_url], payload: @search_options)
             @search_results = EBSCO::EDS::Results.new(_response, @info.available_limiters, options)
             @current_page = @search_results.page_number
             @search_results
@@ -611,12 +608,6 @@ module EBSCO
           resp = connection.send(method) do |req|
             case method
               when :get
-                unless payload.nil?
-                  #qs = CGI.escape(payload.to_query_string)
-                  qs = payload.to_query_string
-                  puts 'QUERY STRING: ' + qs.inspect
-                  path << '?' + qs
-                end
                 req.url path
               when :post
                 req.url path

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.2.6.pre'
+    VERSION = '0.2.7.pre'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 0.2.6.pre
+  version: 0.2.7.pre
 platform: ruby
 authors:
 - Bill McKinney