Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-11 16:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes Elasticsearch querying.

Browse source
This commit is contained in:
Bertrand Bordage 2017-11-23 16:23:48 +01:00
parent 70393cb131
commit 39da11cce6
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
wagtail/wagtailsearch/backends/elasticsearch2.py
View file

@ -384,23 +384,29 @@ class Elasticsearch2SearchQuery(BaseSearchQuery):
operator = self.query.operator
if len(fields) == 1:
field = fields[0]
query = {
if operator == 'or':
return {
'match': {
fields[0]: self.query.query_string,
}
}
return {
'match': {
field: self.query.query_string,
fields[0]: {
'query': self.query.query_string,
'operator': operator,
}
}
}
if operator != 'or':
query['match'][field]['operator'] = operator
else:
query = {
'multi_match': {
'query': self.query.query_string,
'fields': fields,
}
query = {
'multi_match': {
'query': self.query.query_string,
'fields': fields,
}
if operator != 'or':
query['multi_match']['operator'] = operator
}
if operator != 'or':
query['multi_match']['operator'] = operator
return query
def get_content_type_filter(self):