Commit 9b1a1518 authored by lixiaofang's avatar lixiaofang

add

parent 641553bb
...@@ -19,7 +19,8 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50): ...@@ -19,7 +19,8 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
try: try:
have_read_tips_set, ret_list, result_dict = get_query_by_es(query=str(query).lower(), lat=lat, lng=lng, have_read_tips_set, ret_list, result_dict = get_query_by_es(query=str(query).lower(), lat=lat, lng=lng,
offset=offset, offset=offset,
size=size, highlight_query=query) size=size, highlight_query=query,
have_read_tips_set=set())
if len(ret_list) >= 50: if len(ret_list) >= 50:
return ret_list return ret_list
...@@ -90,7 +91,8 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50): ...@@ -90,7 +91,8 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
have_read_tips_set, pinyin_ret_list, result_dict = get_query_by_es(query=str_query, lat=lat, lng=lng, have_read_tips_set, pinyin_ret_list, result_dict = get_query_by_es(query=str_query, lat=lat, lng=lng,
offset=offset, offset=offset,
size=size - len(ret_list), size=size - len(ret_list),
highlight_query=query) highlight_query=query,
have_read_tips_set=have_read_tips_set)
ret_list.extend(pinyin_ret_list) ret_list.extend(pinyin_ret_list)
logging.info("get ret_list:%s" % ret_list) logging.info("get ret_list:%s" % ret_list)
...@@ -120,7 +122,8 @@ def set_highlihgt(query=None, ori_name=None): ...@@ -120,7 +122,8 @@ def set_highlihgt(query=None, ori_name=None):
return highlight_name return highlight_name
def get_query_by_es(query='', lat=0, lng=0, size=0, offset=0, highlight_query=None): def get_query_by_es(query='', lat=0, lng=0, size=0, offset=0, highlight_query=None,
have_read_tips_set=None):
try: try:
query = query.replace("\u2006", '') query = query.replace("\u2006", '')
...@@ -146,7 +149,6 @@ def get_query_by_es(query='', lat=0, lng=0, size=0, offset=0, highlight_query=No ...@@ -146,7 +149,6 @@ def get_query_by_es(query='', lat=0, lng=0, size=0, offset=0, highlight_query=No
} }
get_doctor_hospital_data = list() get_doctor_hospital_data = list()
get_tag_wiki_data = list() get_tag_wiki_data = list()
have_read_tips_set = set()
ret_list = list() ret_list = list()
doctor_hospital_equal_query = list() doctor_hospital_equal_query = list()
tag_equal_query = list() tag_equal_query = list()
...@@ -215,5 +217,4 @@ def get_query_by_es(query='', lat=0, lng=0, size=0, offset=0, highlight_query=No ...@@ -215,5 +217,4 @@ def get_query_by_es(query='', lat=0, lng=0, size=0, offset=0, highlight_query=No
return have_read_tips_set, ret_list, result_dict return have_read_tips_set, ret_list, result_dict
except: except:
return set(), list(), list() return set(), list(), 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