diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 6d799a050131871b7ba9d6b4b75a0b8a1f63b4f8..565c3479979a778f5cce6026b527df159f3ed8ec 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -24,29 +24,5 @@ <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" /> </formatting-settings> </DBN-SQL> - <DBN-PSQL> - <case-options enabled="false"> - <option name="KEYWORD_CASE" value="lower" /> - <option name="FUNCTION_CASE" value="lower" /> - <option name="PARAMETER_CASE" value="lower" /> - <option name="DATATYPE_CASE" value="lower" /> - <option name="OBJECT_CASE" value="preserve" /> - </case-options> - <formatting-settings enabled="false" /> - </DBN-PSQL> - <DBN-SQL> - <case-options enabled="false"> - <option name="KEYWORD_CASE" value="lower" /> - <option name="FUNCTION_CASE" value="lower" /> - <option name="PARAMETER_CASE" value="lower" /> - <option name="DATATYPE_CASE" value="lower" /> - <option name="OBJECT_CASE" value="preserve" /> - </case-options> - <formatting-settings enabled="false"> - <option name="STATEMENT_SPACING" value="one_line" /> - <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" /> - <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" /> - </formatting-settings> - </DBN-SQL> </code_scheme> </component> \ No newline at end of file diff --git a/search/utils/topic.py b/search/utils/topic.py index 2b552dd3d3e3b08a88c0c8aa52a41282808ca90f..5458829be872c2fac6af317a3ee14e63d62c812b 100644 --- a/search/utils/topic.py +++ b/search/utils/topic.py @@ -531,14 +531,14 @@ class TopicUtils(object): "field": "user_id" } q["_source"] = { - "includes": ["id", "pictorial_id", "user_id", "_score"] + "includes": ["id", "pictorial_id", "user_id", "_score","create_time","content_level"] + } + q['sort'] ={ + "sort": [ + {"content_level": {"order": "desc"}}, + {"create_time": {"order": "desc"}} + ] } - # q['sort'] ={ - # "sort": [ - # {"content_level": {"order": "desc"}}, - # {"create_time": {"order": "desc"}} - # ] - # } result_dict = ESPerform.get_search_results(es_cli_obj, sub_index_name=index_type, query_body=q, size=size, routing=routing) topic_id_list = list()