Skip to content

P
physical
Commit 191864a8 authored by 段英荣's avatar 段英荣
Browse files
Options

Merge branch 'highlight' into 'master' 

Highlight

See merge request !419
parents c170184a 7f2be2f5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 29 deletions
libs/es.py
View file @ 191864a8
......@@ -155,9 +155,9 @@ class ESPerform(object):
bulk_actions = []
if sub_index_name=="topic" or \
sub_index_name=="topic-star-routing" or \
sub_index_name=="topic-high-star":
if sub_index_name == "topic" or \
sub_index_name == "topic-star-routing" or \
sub_index_name == "topic-high-star":
for data in data_list:
if data:
bulk_actions.append({
......@@ -232,7 +232,7 @@ class ESPerform(object):
return {"total_count": 0, "hits": []}
@classmethod
def get_analyze_results(cls,es_cli, sub_index_name, query_body):
def get_analyze_results(cls, es_cli, sub_index_name, query_body):
try:
assert (es_cli is not None)
......@@ -242,7 +242,7 @@ class ESPerform(object):
logging.error("index:%s is not existing,get_search_results error!" % official_index_name)
return None
res = es_cli.indices.analyze(index=official_index_name,body=query_body)
res = es_cli.indices.analyze(index=official_index_name, body=query_body)
return res
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
......@@ -298,8 +298,8 @@ class ESPerform(object):
functions_list += [
{
"filter": {
"constant_score":{
"filter":{
"constant_score": {
"filter": {
"term": {"content_level": 6}}
}
},
......@@ -307,8 +307,8 @@ class ESPerform(object):
},
{
"filter": {
"constant_score":{
"filter":{
"constant_score": {
"filter": {
"term": {"content_level": 5}}
}
},
......@@ -316,8 +316,8 @@ class ESPerform(object):
},
{
"filter": {
"constant_score":{
"filter":{
"constant_score": {
"filter": {
"term": {"content_level": 4}}
}
},
......@@ -411,7 +411,7 @@ class ESPerform(object):
}
},
"_source": {
"include": ["id","user_id"]
"include": ["id", "user_id"]
},
"sort": [
{"latest_reply_time": {"order": "desc"}},
......@@ -429,7 +429,8 @@ class ESPerform(object):
"id": have_read_topic_id_list
}
}
result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name="topic-high-star", query_body=q,
result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name="topic-high-star",
query_body=q,
offset=0, size=size, routing="6")
topic_id_list = [item["_source"]["id"] for item in result_dict["hits"]]
......@@ -441,7 +442,17 @@ class ESPerform(object):
logging.info("topic_id_list:%s" % str(topic_id_dict))
return topic_id_list,topic_id_dict
return topic_id_list, topic_id_dict
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return list()
@classmethod
def get_highlight(cls, fields=[]):
field_highlight = {
'fields': {k: {} for k in fields},
'pre_tags': ['<%s>' % 'ems'],
'post_tags': ['</%s>' % 'ems']
}
return field_highlight
search/utils/topic.py
View file @ 191864a8
......@@ -159,6 +159,9 @@ class TopicUtils(object):
user_tag_list = result_dict["hits"][0]["_source"]["tag_list"]
q = dict()
topic_id_list = list()
q["query"] = dict()
functions_list = [
......@@ -233,6 +236,7 @@ class TopicUtils(object):
'operator': 'or',
'fields': ["content", "tag_name_list"],
}
query_function_score["boost_mode"] = "replace"
query_function_score["query"]["bool"]["should"] = [
{'multi_match': multi_match},
......@@ -261,7 +265,7 @@ class TopicUtils(object):
{"term": {"content_level": 6}}
)
q["_source"] = {
"includes": ["id"]
"includes": ["id", "highlight", "description"]
}
if query is None:
......@@ -319,6 +323,13 @@ class TopicUtils(object):
}
}
]
result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name=index_type, query_body=q,
offset=offset, size=size, routing=routing)
for item in result_dict["hits"]:
topic_id_list.append(item["_source"]["id"])
else:
multi_match = {
'query': query,
......@@ -329,9 +340,9 @@ class TopicUtils(object):
functions_list += [
{
"weight": 400,
"filter":{
"constant_score":{
"filter":{
"filter": {
"constant_score": {
"filter": {
"term": {"user_nick_name_pre": query.lower()}
}
}
......@@ -340,15 +351,15 @@ class TopicUtils(object):
{
"weight": 400,
"filter": {
"constant_score":{
"filter":{
"constant_score": {
"filter": {
"bool": {
"must": {
"term": {"content_level": 6},
},
"minimum_should_match": 1,
"should": [
{'match_phrase': {"content":query}},
{'match_phrase': {"content": query}},
{'match_phrase': {"tag_name_list": query}},
# {'multi_match': multi_match},
{"term": {"tag_list": tag_id}},
......@@ -362,8 +373,8 @@ class TopicUtils(object):
{
"weight": 400,
"filter": {
"constant_score":{
"filter":{
"constant_score": {
"filter": {
"bool": {
"must": {
"term": {"content_level": 5},
......@@ -384,8 +395,8 @@ class TopicUtils(object):
{
"weight": 400,
"filter": {
"constant_score":{
"filter":{
"constant_score": {
"filter": {
"bool": {
"must": {
"term": {"content_level": 4},
......@@ -425,7 +436,7 @@ class TopicUtils(object):
}
},
{
"latest_reply_time":{
"latest_reply_time": {
"order": "desc"
}
},
......@@ -435,14 +446,14 @@ class TopicUtils(object):
}
}
]
q["highlight"] = ESPerform.get_highlight(["content"])
result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name=index_type, query_body=q,
offset=offset, size=size, routing=routing)
topic_id_list = list()
for item in result_dict["hits"]:
topic_id_list.append(item["_source"]["id"])
topic_id_list.append({"id": item["_source"]["id"], "highlight": item.get("highlight", {})})
return topic_id_list
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
......
search/views/topic.py
View file @ 191864a8
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment