Merge branch 'dev' into 'master'

quchong

See merge request !8

search/utils/auto_tips.py

@@ -37,35 +37,38 @@ def get_suggest_tips(query,lat,lng,offset=0,size=50):
             }
         }
 
+        have_read_tips_set = set()
         ret_list = list()
         result_dict = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="suggest",query_body=q,offset=offset,size=size,is_suggest_request=True)
         for tips_item in result_dict["suggest"]["tips-suggest"]:
             for hit_item in tips_item["options"]:
 
-                highlight_marks = u'<ems>%s</ems>' % query
-                hit_item["_source"]["highlight_name"] = hit_item["_source"]["ori_name"].replace(query,highlight_marks)
+                if hit_item["_source"]["ori_name"] not in have_read_tips_set:
+                    have_read_tips_set.add(hit_item["_source"]["ori_name"])
+                    highlight_marks = u'<ems>%s</ems>' % query
+                    hit_item["_source"]["highlight_name"] = hit_item["_source"]["ori_name"].replace(query,highlight_marks)
 
-                if hit_item["_source"]["type_flag"] == "hospital":
-                    if hit_item["_source"]["ori_name"] in g_hospital_pos_dict:
-                        distance = point_distance(lng,lat,g_hospital_pos_dict[hit_item["_source"]["ori_name"]][0],g_hospital_pos_dict[hit_item["_source"]["ori_name"]][1])
-                        if distance < 1000*50:
-                            if distance < 1000:
-                                if distance < 100:
-                                    hit_item["_source"]["describe"] = "<100" + "米"
+                    if hit_item["_source"]["type_flag"] == "hospital":
+                        if hit_item["_source"]["ori_name"] in g_hospital_pos_dict:
+                            distance = point_distance(lng,lat,g_hospital_pos_dict[hit_item["_source"]["ori_name"]][0],g_hospital_pos_dict[hit_item["_source"]["ori_name"]][1])
+                            if distance < 1000*50:
+                                if distance < 1000:
+                                    if distance < 100:
+                                        hit_item["_source"]["describe"] = "<100" + "米"
+                                    else:
+                                        hit_item["_source"]["describe"] = "约" + str(int(distance)) + "米"
                                 else:
-                                    hit_item["_source"]["describe"] = "约" + str(int(distance)) + "米"
+                                    hit_item["_source"]["describe"] = "约" + str(round(1.0*distance/1000,1)) + "km"
                             else:
-                                hit_item["_source"]["describe"] = "约" + str(round(1.0*distance/1000,1)) + "km"
+                                hit_item["_source"]["describe"] = ">50km"
                         else:
-                            hit_item["_source"]["describe"] = ">50km"
+                            hit_item["_source"]["describe"] = ""
                     else:
-                        hit_item["_source"]["describe"] = ""
-                else:
-                    if hit_item["_source"]["type_flag"] == "doctor":
-                        hit_item["_source"]["describe"] = ""
-                    else:
-                        hit_item["_source"]["describe"] = "约"+str(hit_item["_source"]["results_num"])+"个结果" if hit_item["_source"]["results_num"] else ""
-                ret_list.append(hit_item["_source"])
+                        if hit_item["_source"]["type_flag"] == "doctor":
+                            hit_item["_source"]["describe"] = ""
+                        else:
+                            hit_item["_source"]["describe"] = "约"+str(hit_item["_source"]["results_num"])+"个结果" if hit_item["_source"]["results_num"] else ""
+                    ret_list.append(hit_item["_source"])
 
         return ret_list
     except: