Skip to content

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

add

parent 85bad37b
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 22 deletions
search/views/group.py
View file @ 33a36468
...@@ -162,19 +162,11 @@ def pictorial_topic(topic_id=-1, offset=0, size=10): ...@@ -162,19 +162,11 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
num = 10 - len(pictorial_id_list) num = 10 - len(pictorial_id_list)
q["query"] = { q["query"] = {
"bool": { "bool": {
"must": [{ "must": {
"term": { "terms": {
"is_online": True} "tag_id": topic_tag_list
},
{"term": {
"is_delete": False}
},
{"terms": {
"tag_id": topic_tag_list
}} }}
]
} }
} }
q["_source"] = { q["_source"] = {
"include": ["id", "tag_id"]} "include": ["id", "tag_id"]}
...@@ -189,22 +181,22 @@ def pictorial_topic(topic_id=-1, offset=0, size=10): ...@@ -189,22 +181,22 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
result_dict = ESPerform.get_search_results(es_cli_obj, "pictorial", q, offset, size) result_dict = ESPerform.get_search_results(es_cli_obj, "pictorial", q, offset, size)
if len(result_dict["hits"]) > 0: if len(result_dict["hits"]) > 0:
for item in result_dict["hits"]: for
id = item["_source"]["id"] item in result_dict["hits"]:
if id not in pictorial_id_list: id = item["_source"]["id"]
pictorial_id_list.append(id) # if id not in pictorial_id_list:
pictorial_id_list.append(id) #
logging.info("get result_dict tag:%s" % result_dict) logging.info("get result_dict tag:%s" % result_dict)
logging.info("get pictorial_id_list tag:%s" % pictorial_id_list) logging.info("get pictorial_id_list tag:%s" % pictorial_id_list)
pictorial_list = pictorial_id_list if len(pictorial_id_list) < 10 else pictorial_id_list[:10] pictorial_list = pictorial_id_list if len(pictorial_id_list) < 10 else pictorial_id_list[:10]
return {"pictorial_ids_list": pictorial_list} return {"pictorial_ids_list": pictorial_list}
else:
return {"pictorial_ids_list": pictorial_id_list}
else:
return {"pictorial_ids_list": pictorial_id_list}
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return {"pictorial_ids_list": []} return {"pictorial_ids_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