Skip to content

P
physical
Commit 394e5924 authored by zhanglu's avatar zhanglu
Browse files
Options

fix

parent a8c37320
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 25 deletions
search/utils/topic.py
View file @ 394e5924
...@@ -561,6 +561,9 @@ class TopicUtils(object): ...@@ -561,6 +561,9 @@ class TopicUtils(object):
for k, v in filters.items(): for k, v in filters.items():
if not v:
continue
if k in ["create_time_gte", "create_time_lte"]: if k in ["create_time_gte", "create_time_lte"]:
if k == "create_time_gte": if k == "create_time_gte":
...@@ -620,30 +623,31 @@ class TopicUtils(object): ...@@ -620,30 +623,31 @@ class TopicUtils(object):
}) })
elif isinstance(sorts_by, list): elif isinstance(sorts_by, list):
if sorts_by == TOPIC_SEARCH_SORT.ID_ASC: for sort_by in sorts_by:
sort_rule.append({ if sort_by == TOPIC_SEARCH_SORT.ID_AEC:
"id":{ sort_rule.append({
"order":"asc" "id":{
}, "order":"asc"
}) },
elif sorts_by == TOPIC_SEARCH_SORT.ID_DESC: })
sort_rule.append({ elif sort_by == TOPIC_SEARCH_SORT.ID_DESC:
"id":{ sort_rule.append({
"order":"desc" "id":{
}, "order":"desc"
}) },
elif sorts_by == TOPIC_SEARCH_SORT.SCORE_AEC: })
sort_rule.append({ elif sort_by == TOPIC_SEARCH_SORT.SCORE_AEC:
"sort_score":{ sort_rule.append({
"order":"asc" "sort_score":{
}, "order":"asc"
}) },
elif sorts_by == TOPIC_SEARCH_SORT.SCORE_DESC: })
sort_rule.append({ elif sort_by == TOPIC_SEARCH_SORT.SCORE_DESC:
"sort_score":{ sort_rule.append({
"order":"desc" "sort_score":{
}, "order":"desc"
}) },
})
return sort_rule return sort_rule
...@@ -662,7 +666,8 @@ class TopicUtils(object): ...@@ -662,7 +666,8 @@ class TopicUtils(object):
if sorts_by: if sorts_by:
sorts = cls.process_sort(sorts_by) sorts = cls.process_sort(sorts_by)
q["sort"] = sorts if sorts:
q["sort"] = sorts
try: try:
result_dict = ESPerform.get_search_results( result_dict = ESPerform.get_search_results(
......
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