ebsco-eds 0.2.5.pre → 0.2.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e370c38b63e3ff1410ce4cee4d50394d5f2df67
-  data.tar.gz: d22f2c176ffa0a2f26625a472662b6f9397b052f
+  metadata.gz: bfd407ab03719f2a750c7f1ce0e2be15b66a4881
+  data.tar.gz: 27459d516520b6d04177b3c3e7a7d62e3f90c64e
 SHA512:
-  metadata.gz: 35b21cfb0179fe336a2adc0a4a848e184689a0eadd4ebf14900d8d60a90b8d60951df8a361d950a11bdc21c8ee75b2c7e94e1e86337b8de6df26806661670834
-  data.tar.gz: e40c20c649c5a7fb5edddddf461ec34f2a340358f6a7c3f47cb79cc3b86f419af6343900e9ac3a91081d5660387c5a912dc0fb7865114abdac0dabb2630ce95b
+  metadata.gz: b81e001912a950d9791b6d8e65985fe9a1f4233a28837c3f1d0c4961c6d5386e5c3bae27f658ea588f514c2ee914853f058c33067c7dc8d6276a02243edc593c
+  data.tar.gz: 12a97e2f33bb4daf527df57988404d7d58fef8666993862e0252ea51fe96451d7c2da96c894b048201187175532e47923c275dd8431c3d09cb36c816aeb318d4

data/lib/ebsco/eds/options.rb

@@ -228,8 +228,77 @@ module EBSCO
       #     false
       #   end
       # 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
   
     class SearchCriteria
       include JSONable

data/lib/ebsco/eds/session.rb

@@ -195,7 +195,8 @@ 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(:post, path: @config[:search_url], payload: @search_options)
+            _response = do_request(:get, 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
@@ -207,8 +208,10 @@ 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(:post, path: @config[:search_url], payload: @search_options)
+            _response = do_request(:get, 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
@@ -608,6 +611,12 @@ 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.5.pre'
+    VERSION = '0.2.6.pre'
   end
 end

metadata

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