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

Bug fixes, ES7

Browse Source
This commit is contained in:
simon
2019-06-14 13:27:41 -04:00
parent 41ba6a35a4
commit 31877283b3
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
search/search.py
View File

@@ -1,5 +1,7 @@
import os
import time
from urllib.parse import urljoin
import ujson
import elasticsearch
@@ -82,7 +84,7 @@ class ElasticSearchEngine(SearchEngine):
"type": "nGram", "min_gram": 3, "max_gram": 3
}
}
}}, index=self.index_name, request_timeout=60)
}}, index=self.index_name)
self.es.indices.put_settings(body={
"analysis": {
"analyzer": {
@@ -104,7 +106,7 @@ class ElasticSearchEngine(SearchEngine):
"ext": {"type": "keyword"},
},
"_routing": {"required": True}
}, doc_type="file", index=self.index_name, request_timeout=60)
}, doc_type="file", index=self.index_name, include_type_name=True)
self.es.indices.open(index=self.index_name)
@@ -327,7 +329,7 @@ class ElasticSearchEngine(SearchEngine):
index=self.index_name, request_timeout=20, routing=website_id)
for hit in hits:
src = hit["_source"]
yield base_url + src["path"] + ("/" if src["path"] != "" else "") + src["name"] + \
yield urljoin(base_url, "/") + src["path"] + ("/" if src["path"] != "" else "") + src["name"] + \
("." if src["ext"] != "" else "") + src["ext"]
def get_global_stats(self):