Commit 20390b32 authored by 李小芳's avatar 李小芳

Merge branch 'wordres' into 'master'

add

See merge request !33
parents e7c25ac5 73a98c6d
...@@ -117,7 +117,6 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50): ...@@ -117,7 +117,6 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name="suggest", query_body=q, result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name="suggest", query_body=q,
offset=offset, size=size, is_suggest_request=True) offset=offset, size=size, is_suggest_request=True)
logging.info("get result_dict:%s" % result_dict)
for tips_item in result_dict["suggest"]["tips-suggest"]: for tips_item in result_dict["suggest"]["tips-suggest"]:
for hit_item in tips_item["options"]: for hit_item in tips_item["options"]:
...@@ -163,7 +162,6 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50): ...@@ -163,7 +162,6 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
ret_list.extend(get_tag_wiki_data) ret_list.extend(get_tag_wiki_data)
ret_list.extend(get_doctor_hospital_data) ret_list.extend(get_doctor_hospital_data)
logging.info("get have_read_tips_set:%s" % have_read_tips_set)
if len(result_dict["suggest"]["tips-suggest"]) >= 50: if len(result_dict["suggest"]["tips-suggest"]) >= 50:
return ret_list return ret_list
...@@ -174,9 +172,7 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50): ...@@ -174,9 +172,7 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
QUERY_KEY = "query:search_tip" QUERY_KEY = "query:search_tip"
query_base64 = base64.b64encode(query.encode('utf8')).decode('utf8') query_base64 = base64.b64encode(query.encode('utf8')).decode('utf8')
if redis_client.hget(QUERY_KEY, query_base64) is not None: if redis_client.hget(QUERY_KEY, query_base64) is not None:
logging.info("get type:%s" %type(redis_client.hget(QUERY_KEY, query_base64)))
value_data = json.loads(str(redis_client.hget(QUERY_KEY, query_base64),encoding='utf-8')) value_data = json.loads(str(redis_client.hget(QUERY_KEY, query_base64),encoding='utf-8'))
logging.info("get value_data:%s" % value_data)
if len(value_data) > 0: if len(value_data) > 0:
for i in value_data: for i in value_data:
...@@ -201,8 +197,6 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50): ...@@ -201,8 +197,6 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
"offline_score": 0, "offline_score": 0,
"type_flag": get_tips_word_type(ori_name), "highlight_name": highlight_name, "type_flag": get_tips_word_type(ori_name), "highlight_name": highlight_name,
"describe": describe}) "describe": describe})
logging.info("get query_ret_list:%s" % query_ret_list)
logging.info("get wordresemble_ret_list:%s" % wordresemble_ret_list)
ret_list.extend(query_ret_list) ret_list.extend(query_ret_list)
ret_list.extend(wordresemble_ret_list) ret_list.extend(wordresemble_ret_list)
if len(ret_list) >= 50: if len(ret_list) >= 50:
......
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