ebsco-eds 0.2.5.pre → 0.2.6.pre
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ebsco/eds/options.rb +71 -2
- data/lib/ebsco/eds/session.rb +11 -2
- data/lib/ebsco/eds/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bfd407ab03719f2a750c7f1ce0e2be15b66a4881
|
4
|
+
data.tar.gz: 27459d516520b6d04177b3c3e7a7d62e3f90c64e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b81e001912a950d9791b6d8e65985fe9a1f4233a28837c3f1d0c4961c6d5386e5c3bae27f658ea588f514c2ee914853f058c33067c7dc8d6276a02243edc593c
|
7
|
+
data.tar.gz: 12a97e2f33bb4daf527df57988404d7d58fef8666993862e0252ea51fe96451d7c2da96c894b048201187175532e47923c275dd8431c3d09cb36c816aeb318d4
|
data/lib/ebsco/eds/options.rb
CHANGED
@@ -228,8 +228,77 @@ module EBSCO
|
|
228
228
|
# false
|
229
229
|
# end
|
230
230
|
# end
|
231
|
-
|
232
|
-
|
231
|
+
|
232
|
+
|
233
|
+
# query-1=AND,volcano&sort=relevance&includefacets=y&searchmode=all&autosuggest=n&view=brief&resultsperpage=20&pagenumber=1&highlight=y
|
234
|
+
def to_query_string
|
235
|
+
qs = ''
|
236
|
+
|
237
|
+
# SEARCH CRITERIA:
|
238
|
+
|
239
|
+
# query
|
240
|
+
# if @SearchCriteria.Queries[0].has_key? :BooleanOperator
|
241
|
+
# qs << 'query=' + @SearchCriteria.Queries[0][:BooleanOperator]
|
242
|
+
# else
|
243
|
+
# qs << 'query=AND'
|
244
|
+
# end
|
245
|
+
# if @SearchCriteria.Queries[0].has_key? :FieldCode
|
246
|
+
# qs << ',' + @SearchCriteria.Queries[0][:FieldCode]
|
247
|
+
# end
|
248
|
+
qs << 'query=' + @SearchCriteria.Queries[0][:Term]
|
249
|
+
|
250
|
+
# mode
|
251
|
+
qs << '&searchmode=' + @SearchCriteria.SearchMode
|
252
|
+
|
253
|
+
# facets
|
254
|
+
qs << '&includefacets=' + @SearchCriteria.IncludeFacets
|
255
|
+
|
256
|
+
# sort
|
257
|
+
qs << '&sort=' + @SearchCriteria.Sort
|
258
|
+
|
259
|
+
# auto-suggest
|
260
|
+
qs << '&autosuggest=' + @SearchCriteria.AutoSuggest
|
261
|
+
|
262
|
+
# limiters
|
263
|
+
unless @SearchCriteria.Limiters.nil?
|
264
|
+
qs << '&limiter=' + @SearchCriteria.Limiters
|
265
|
+
end
|
266
|
+
|
267
|
+
# expanders
|
268
|
+
qs << '&expander=' + @SearchCriteria.Expanders.join(',')
|
269
|
+
|
270
|
+
# facet filters
|
271
|
+
unless @SearchCriteria.FacetFilters.nil?
|
272
|
+
qs << '&facetfilter=1,' + @SearchCriteria.FacetFilters
|
273
|
+
end
|
274
|
+
|
275
|
+
# related content
|
276
|
+
unless @SearchCriteria.RelatedContent.nil?
|
277
|
+
qs << '&relatedcontent=' + @SearchCriteria.RelatedContent.join(',')
|
278
|
+
# TODO: publication ID
|
279
|
+
|
280
|
+
# Retrieval Criteria
|
281
|
+
|
282
|
+
unless @RetrievalCriteria.View.nil?
|
283
|
+
qs << '&view=' + @RetrievalCriteria.View
|
284
|
+
end
|
285
|
+
unless @RetrievalCriteria.ResultsPerPage.nil?
|
286
|
+
qs << '&resultsperpage=' + @RetrievalCriteria.ResultsPerPage.to_s
|
287
|
+
end
|
288
|
+
unless @RetrievalCriteria.PageNumber.nil?
|
289
|
+
qs << '&pagenumber=' + @RetrievalCriteria.PageNumber.to_s
|
290
|
+
end
|
291
|
+
unless @RetrievalCriteria.Highlight.nil?
|
292
|
+
qs << '&highlight=' + @RetrievalCriteria.Highlight
|
293
|
+
end
|
294
|
+
|
295
|
+
qs
|
296
|
+
end
|
297
|
+
end
|
298
|
+
|
299
|
+
|
300
|
+
|
301
|
+
end
|
233
302
|
|
234
303
|
class SearchCriteria
|
235
304
|
include JSONable
|
data/lib/ebsco/eds/session.rb
CHANGED
@@ -195,7 +195,8 @@ module EBSCO
|
|
195
195
|
if @search_options.nil?
|
196
196
|
@search_results = EBSCO::EDS::Results.new(empty_results)
|
197
197
|
else
|
198
|
-
_response = do_request(:post, path: @config[:search_url], payload: @search_options)
|
198
|
+
#_response = do_request(:post, path: @config[:search_url], payload: @search_options)
|
199
|
+
_response = do_request(:get, path: @config[:search_url], payload: @search_options)
|
199
200
|
@search_results = EBSCO::EDS::Results.new(_response, @info.available_limiters, options)
|
200
201
|
@current_page = @search_results.page_number
|
201
202
|
@search_results
|
@@ -207,8 +208,10 @@ module EBSCO
|
|
207
208
|
# create/recreate the search options if nil or not passing actions
|
208
209
|
if @search_options.nil? || !add_actions
|
209
210
|
@search_options = EBSCO::EDS::Options.new(options, @info)
|
211
|
+
puts 'OPTIONS AS QUERY STRING: ' + @search_options.to_query_string
|
210
212
|
end
|
211
|
-
_response = do_request(:post, path: @config[:search_url], payload: @search_options)
|
213
|
+
#_response = do_request(:post, path: @config[:search_url], payload: @search_options)
|
214
|
+
_response = do_request(:get, path: @config[:search_url], payload: @search_options)
|
212
215
|
@search_results = EBSCO::EDS::Results.new(_response, @info.available_limiters, options)
|
213
216
|
@current_page = @search_results.page_number
|
214
217
|
@search_results
|
@@ -608,6 +611,12 @@ module EBSCO
|
|
608
611
|
resp = connection.send(method) do |req|
|
609
612
|
case method
|
610
613
|
when :get
|
614
|
+
unless payload.nil?
|
615
|
+
#qs = CGI.escape(payload.to_query_string)
|
616
|
+
qs = payload.to_query_string
|
617
|
+
puts 'QUERY STRING: ' + qs.inspect
|
618
|
+
path << '?' + qs
|
619
|
+
end
|
611
620
|
req.url path
|
612
621
|
when :post
|
613
622
|
req.url path
|
data/lib/ebsco/eds/version.rb
CHANGED