modify

libs/es.py

@@ -167,7 +167,7 @@ class ESPerform(object):
 
     @classmethod
     def get_search_results(cls, es_cli,sub_index_name,query_body,offset=0,size=10,
-                           auto_create_index=False,doc_type="_doc",aggregations_query=False):
+                           auto_create_index=False,doc_type="_doc",aggregations_query=False,is_suggest_request=False):
         try:
             assert (es_cli is not None)
 
@@ -183,14 +183,17 @@ class ESPerform(object):
 
             logging.info("duan add,query_body:%s" % str(query_body).encode("utf-8"))
             res = es_cli.search(index=official_index_name,doc_type=doc_type,body=query_body,from_=offset,size=size)
-            result_dict = {
-                "total_count":res["hits"]["total"],
-                "hits":res["hits"]["hits"]
-            }
-            if aggregations_query:
-                result_dict["aggregations"] = res["aggregations"]
-
-            return result_dict
+
+            if is_suggest_request:
+                return res
+            else:
+                result_dict = {
+                    "total_count":res["hits"]["total"],
+                    "hits":res["hits"]["hits"]
+                }
+                if aggregations_query:
+                    result_dict["aggregations"] = res["aggregations"]
+                return result_dict
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return {"total_count":0,"hits":[]}
\ No newline at end of file

search/views/tag.py

@@ -76,8 +76,8 @@ def query_tag(query,offset,size):
 
         ret_list = list()
 
-        result_dict = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="tag",query_body=q,offset=offset,size=size)
-        for hit_item in result_dict["hits"]:
+        result_dict = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="tag",query_body=q,offset=offset,size=size,is_suggest_request=True)
+        for hit_item in result_dict["suggest"]["tips-suggest"]["options"]:
             hit_item["_source"]["highlight"] = u'<ems>%s</ems>' % query
             ret_list.append(hit_item["_source"])