Commit a44bd0bc authored by 李小芳's avatar 李小芳

Merge branch 'update_size' into 'master'

add

See merge request !53
parents f1aa8d09 4c5519bf
...@@ -60,10 +60,12 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None): ...@@ -60,10 +60,12 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
end_data.append(item) end_data.append(item)
equal_data.extend(front_data) equal_data.extend(front_data)
equal_data.extend(end_data) equal_data.extend(end_data)
equal_data.extend(ret_list[30:]) # equal_data.extend(ret_list[30:])
ret_list = equal_data ret_list = equal_data
if len(ret_list) >= 50: if len(ret_list) >= 50:
if gray_number in (2, 3):
return ret_list[:30]
logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list))) logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list)))
return ret_list[:50] return ret_list[:50]
...@@ -119,10 +121,16 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None): ...@@ -119,10 +121,16 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
#### ####
if len(ret_list) >= 50: if len(ret_list) >= 50:
if gray_number in (2, 3):
return ret_list[:30]
logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list))) logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list)))
return ret_list[0:50] return ret_list[0:50]
elif len(ret_list) < 50 and len(ret_list) > 3: elif len(ret_list) < 50 and len(ret_list) > 3:
if gray_number in (2, 3):
return ret_list[:30]
logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list))) logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list)))
return ret_list return ret_list
...@@ -141,6 +149,9 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None): ...@@ -141,6 +149,9 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50, device_id=None):
sub_index_name=sub_index_name) sub_index_name=sub_index_name)
ret_list.extend(pinyin_ret_list) ret_list.extend(pinyin_ret_list)
logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list))) logging.info("user_search_query:%s,get_sug_num:%s" % (query, len(ret_list)))
if gray_number in (2, 3):
return ret_list[:30]
return ret_list return ret_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