simon987/od-database
1
0
Fork 0
mirror of https://github.com/simon987/od-database.git synced 2025-12-16 08:09:04 +00:00
Code Issues Projects Releases Wiki Activity

More search options

Browse Source
This commit is contained in:
Simon
2018-06-26 21:38:26 -04:00
parent b1ad39c204
commit b570e81bec
4 changed files with 102 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
search/search.py
View File

@@ -16,7 +16,7 @@ class SearchEngine:
def import_json(self, in_str: str, website_id: int):
raise NotImplementedError
def search(self, query, page, per_page, sort_order, extension, size_min, size_max) -> {}:
def search(self, query, page, per_page, sort_order, extension, size_min, size_max, match_all, fields) -> {}:
raise NotImplementedError
def reset(self):
@@ -142,7 +142,7 @@ class ElasticSearchEngine(SearchEngine):
action_string = '{"index":{}}\n'
return "\n".join("".join([action_string, ujson.dumps(doc)]) for doc in docs)
def search(self, query, page, per_page, sort_order, extensions, size_min, size_max) -> {}:
def search(self, query, page, per_page, sort_order, extensions, size_min, size_max, match_all, fields) -> {}:
filters = []
if extensions:
@@ -167,8 +167,8 @@ class ElasticSearchEngine(SearchEngine):
"must": {
"multi_match": {
"query": query,
"fields": ["name^5", "name.nGram^2", "path"],
"operator": "or"
"fields": fields,
"operator": "or" if match_all else "and"
}
},
"filter": filters