ebsco-eds 0.2.6.pre → 0.2.7.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 +4 -71
- data/lib/ebsco/eds/session.rb +2 -11
- 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: 45213f8ec76681800d8faa12c1c3057cef0db0fe
|
4
|
+
data.tar.gz: dc678cf8c0f73da99d72235001594e108156c8a8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fe341931d46051bcb6cb8c4c2d13e283c66024bfd6a25ca4c212bf270f649efc71c88558876e28383ac5ff6a7058bfa977e86d4db12c59fa031d854f27a350d5
|
7
|
+
data.tar.gz: e2b9374d44c4a37379d9d34e7b37702a83e719734ac767059df5167fe3e8fec869b1462660bb07dda347663b488c44f5f5ff644386125ef17219cbbc4b44a2c6
|
data/lib/ebsco/eds/options.rb
CHANGED
@@ -228,77 +228,8 @@ module EBSCO
|
|
228
228
|
# false
|
229
229
|
# end
|
230
230
|
# end
|
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
|
231
|
+
|
232
|
+
end
|
302
233
|
|
303
234
|
class SearchCriteria
|
304
235
|
include JSONable
|
@@ -355,6 +286,8 @@ module EBSCO
|
|
355
286
|
_field_code = 'IS'
|
356
287
|
when 'isbn'
|
357
288
|
_field_code = 'IB'
|
289
|
+
when 'descriptor'
|
290
|
+
_field_code = 'DE'
|
358
291
|
end
|
359
292
|
end
|
360
293
|
|
data/lib/ebsco/eds/session.rb
CHANGED
@@ -195,8 +195,7 @@ module EBSCO
|
|
195
195
|
if @search_options.nil?
|
196
196
|
@search_results = EBSCO::EDS::Results.new(empty_results)
|
197
197
|
else
|
198
|
-
|
199
|
-
_response = do_request(:get, path: @config[:search_url], payload: @search_options)
|
198
|
+
_response = do_request(:post, path: @config[:search_url], payload: @search_options)
|
200
199
|
@search_results = EBSCO::EDS::Results.new(_response, @info.available_limiters, options)
|
201
200
|
@current_page = @search_results.page_number
|
202
201
|
@search_results
|
@@ -208,10 +207,8 @@ module EBSCO
|
|
208
207
|
# create/recreate the search options if nil or not passing actions
|
209
208
|
if @search_options.nil? || !add_actions
|
210
209
|
@search_options = EBSCO::EDS::Options.new(options, @info)
|
211
|
-
puts 'OPTIONS AS QUERY STRING: ' + @search_options.to_query_string
|
212
210
|
end
|
213
|
-
|
214
|
-
_response = do_request(:get, path: @config[:search_url], payload: @search_options)
|
211
|
+
_response = do_request(:post, path: @config[:search_url], payload: @search_options)
|
215
212
|
@search_results = EBSCO::EDS::Results.new(_response, @info.available_limiters, options)
|
216
213
|
@current_page = @search_results.page_number
|
217
214
|
@search_results
|
@@ -611,12 +608,6 @@ module EBSCO
|
|
611
608
|
resp = connection.send(method) do |req|
|
612
609
|
case method
|
613
610
|
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
|
620
611
|
req.url path
|
621
612
|
when :post
|
622
613
|
req.url path
|
data/lib/ebsco/eds/version.rb
CHANGED