Commit d20ce116 authored by lixiaofang's avatar lixiaofang

merge master

parent 6fd369b7
......@@ -182,8 +182,6 @@ class QueryWordAttr(object):
"diary_num").first()
for value in data.values():
total_num += value
print(total_num)
return total_num
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
......
......@@ -33,11 +33,8 @@ class Command(BaseCommand):
try:
es_cli = ESPerform.get_cli()
type_name1 = "suggest-v1"
type_name2 = "suggest-v2"
type_name = "suggest"
if len(options["type"]):
if options["type"] == "all" or type_name == options["type"] or type_name1 == options["type"]:
type_name = options["type"]
......
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