Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added ES 5 support (filtered query has been deprecated and removed in ES 5.0).

Browse source
This commit is contained in:
Martin Edenhofer 2016-11-18 15:42:06 +01:00
parent 925df1ed1d
commit c12372dd47
1 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
lib/search_index_backend.rb
View file

@ -339,8 +339,6 @@ get count of tickets and tickets which match on selector
end end
def self.selector2query(selector, _current_user, aggs_interval, limit) def self.selector2query(selector, _current_user, aggs_interval, limit)
filter_must = []
filter_must_not = []
query_must = [] query_must = []
query_must_not = [] query_must_not = []
if selector && !selector.empty? if selector && !selector.empty?
@ -355,9 +353,9 @@ get count of tickets and tickets which match on selector
t[:term][key_tmp] = data['value'] t[:term][key_tmp] = data['value']
end end
if data['operator'] == 'is' if data['operator'] == 'is'
filter_must.push t query_must.push t
elsif data['operator'] == 'is not' elsif data['operator'] == 'is not'
filter_must_not.push t query_must_not.push t
elsif data['operator'] == 'contains' elsif data['operator'] == 'contains'
query_must.push t query_must.push t
elsif data['operator'] == 'contains not' elsif data['operator'] == 'contains not'
@ -391,43 +389,18 @@ get count of tickets and tickets which match on selector
from: aggs_interval[:from], from: aggs_interval[:from],
to: aggs_interval[:to], to: aggs_interval[:to],
} }
filter_must.push r query_must.push r
end end
if !query_must.empty? || !query_must_not.empty? if !data[:query][:bool]
if !data[:query][:filtered] data[:query][:bool] = {}
data[:query][:filtered] = {}
end
if !data[:query][:filtered][:query]
data[:query][:filtered][:query] = {}
end
if !data[:query][:filtered][:query][:bool]
data[:query][:filtered][:query][:bool] = {}
end
end end
if !query_must.empty? if !query_must.empty?
data[:query][:filtered][:query][:bool][:must] = query_must data[:query][:bool][:must] = query_must
end end
if !query_must_not.empty? if !query_must_not.empty?
data[:query][:filtered][:query][:bool][:must_not] = query_must_not data[:query][:bool][:must_not] = query_must_not
end
if !filter_must.empty? || !filter_must.empty?
if !data[:query][:filtered]
data[:query][:filtered] = {}
end
if !data[:query][:filtered][:filter]
data[:query][:filtered][:filter] = {}
end
if !data[:query][:filtered][:filter][:bool]
data[:query][:filtered][:filter][:bool] = {}
end
end
if !filter_must.empty?
data[:query][:filtered][:filter][:bool][:must] = filter_must
end
if !filter_must_not.empty?
data[:query][:filtered][:filter][:bool][:must_not] = filter_must_not
end end
# add sort # add sort