Merge branch 'ems_ems' into 'master'

添加日志

See merge request !42

search/utils/auto_tips.py

@@ -243,13 +243,17 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
 
 def set_highlihgt(query=None, ori_name=None):
     ###高亮调整
+    all_word = set()
     query2 = ori_name
     for item in range(0, len(query)):
-        is_find = query2.find(query[item])
+        all_word.add(query[item])
+
+    for item in all_word:
+        is_find = query2.find(item)
         high_query = None
         if is_find >= 0:
-            highlight_marks = u'<ems>%s</ems>' % query[item]
-            high_query = query2.replace(query[item], highlight_marks)
+            highlight_marks = u'<ems>%s</ems>' % item
+            high_query = query2.replace(item, highlight_marks)
             query2 = high_query
         if high_query == None:
             highlight_name = query2