Skip to content

P
physical
Commit 991307f8 authored by lixiaofang's avatar lixiaofang
Browse files
Options

add

parent 2d81e1b4
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 16 deletions
search/utils/topic.py
View file @ 991307f8
......@@ -973,6 +973,18 @@ class TopicUtils(object):
"order": "desc"
},
})
if sorts_by == TOPIC_SEARCH_SORT.TOPIC_ADD_TIME:
sort_rule.append({
"related_billboard.topic_add_createtime": {
"order": "desc",
"nested_path": "related_billboard",
"nested_filter": {
"term": {
"related_billboard.pictorial_id": pictorial_id
}
}
},
})
elif isinstance(sorts_by, list):
for sort_by in sorts_by:
......@@ -1067,18 +1079,18 @@ class TopicUtils(object):
}
},
})
elif sort_by == TOPIC_SEARCH_SORT.TOPIC_ADD_TIME:
sort_rule.append({
"related_billboard.topic_add_createtime": {
"order": "desc",
"nested_path": "related_billboard",
"nested_filter": {
"term": {
"related_billboard.pictorial_id": pictorial_id
}
}
},
})
# elif sort_by == TOPIC_SEARCH_SORT.TOPIC_ADD_TIME:
# sort_rule.append({
# "related_billboard.topic_add_createtime": {
# "order": "desc",
# "nested_path": "related_billboard",
# "nested_filter": {
# "term": {
# "related_billboard.pictorial_id": pictorial_id
# }
# }
# },
# })
logging.info("get picotirial:%s" % sort_rule)
......@@ -1097,11 +1109,18 @@ class TopicUtils(object):
}
}
if sorts_by:
sorts = cls.process_sort(sorts_by, pictorial_id=None)
if sorts:
q["sort"] = sorts
if 'pictorial_id' in filters.keys():
if sorts_by:
sorts = cls.process_sort(sorts_by, filters["pictorial_id"])
if sorts:
q["sort"] = sorts
else:
if sorts_by:
sorts = cls.process_sort(sorts_by, pictorial_id=None)
if sorts:
q["sort"] = sorts
logging.info("get --------qqqq:%s" % q)
result_dict = ESPerform.get_search_results(
ESPerform.get_cli(), sub_index_name=index_name,
query_body=q, offset=offset, size=size
......
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