Skip to content

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

Merge branch 'test' of git.wanmeizhensuo.com:alpha/physical into test

parents b62fe284 4f4993b8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 28 deletions
.idea/codeStyles/Project.xml
View file @ d7e0b6c3
...@@ -24,29 +24,5 @@ ...@@ -24,29 +24,5 @@
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" /> <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
</formatting-settings> </formatting-settings>
</DBN-SQL> </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> </code_scheme>
</component> </component>
\ No newline at end of file
search/utils/topic.py
View file @ d7e0b6c3
...@@ -477,7 +477,7 @@ class TopicUtils(object): ...@@ -477,7 +477,7 @@ class TopicUtils(object):
"query": { "query": {
"bool": { "bool": {
"must": [ "must": [
{"range": {"content_level": {"gte": 5, "lte": 6}}}, {"range": {"content_level": {"gte": 3, "lte": 6}}},
{"term": {"is_online": True}}, {"term": {"is_online": True}},
{"term": {"is_deleted": False}} {"term": {"is_deleted": False}}
], ],
...@@ -514,13 +514,13 @@ class TopicUtils(object): ...@@ -514,13 +514,13 @@ class TopicUtils(object):
} }
if len(topic_tag_list) > 0: if len(topic_tag_list) > 0:
query_function_score["query"]["bool"]["should"] = { query_function_score["query"]["bool"]["filter"] = {
"terms": { "terms": {
"tag_list": topic_tag_list "tag_list": topic_tag_list
} }
} }
if topic_user_id != -1: if topic_user_id != -1:
query_function_score["query"]["bool"]["must"] += { query_function_score["query"]["bool"]["filter"] = {
"term": { "term": {
"user_id": topic_user_id "user_id": topic_user_id
} }
......
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