Skip to content

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

Merge branch 'dev' into 'master' 

modify

See merge request !14
parents 817c8262 074d6891
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 17 deletions
search/utils/topic.py
View file @ d3c8f609
...@@ -140,21 +140,6 @@ class TopicUtils(object): ...@@ -140,21 +140,6 @@ class TopicUtils(object):
q["query"] = dict() q["query"] = dict()
functions_list = [ functions_list = [
{
"filter": {"bool": {
"should": attention_user_id_term_list}},
"weight": 5,
},
{
"filter": {"bool": {
"should": pick_user_id_term_list}},
"weight": 3
},
{
"filter": {"bool": {
"should": same_group_user_id_term_list}},
"weight": 2
},
{ {
"gauss": { "gauss": {
"update_time": { "update_time": {
...@@ -165,6 +150,31 @@ class TopicUtils(object): ...@@ -165,6 +150,31 @@ class TopicUtils(object):
} }
] ]
if len(attention_user_id_term_list)>0:
functions_list.append(
{
"filter": {"bool": {
"should": attention_user_id_term_list}},
"weight": 3,
}
)
elif len(pick_user_id_term_list)>0:
functions_list.append(
{
"filter": {"bool": {
"should": pick_user_id_term_list}},
"weight": 2
}
)
elif len(same_group_user_id_term_list)>0:
functions_list.append(
{
"filter": {"bool": {
"should": same_group_user_id_term_list}},
"weight": 1
}
)
query_tag_term_list = cls.___get_should_term_list(user_tag_list) query_tag_term_list = cls.___get_should_term_list(user_tag_list)
query_function_score = { query_function_score = {
"query": { "query": {
...@@ -175,8 +185,8 @@ class TopicUtils(object): ...@@ -175,8 +185,8 @@ class TopicUtils(object):
} }
} }
}, },
"score_mode": "max", "score_mode": "sum",
"boost_mode": "replace", "boost_mode": "sum",
"functions": functions_list "functions": functions_list
} }
......
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