modify

search/views/tag.py

@@ -20,6 +20,7 @@ def get_highlight(fields=[]):
     }
     return field_highlight
 
+
 @bind("physical/search/query_tag")
 def query_tag(query,offset,size):
     try:
@@ -50,7 +51,42 @@ def query_tag(query,offset,size):
 
         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"]:
-            hit_item["_source"]["highlight"] = hit_item["highlight"]
+            if "name" in hit_item["highlight"] and len(hit_item["highlight"]["name"])>0:
+                hit_item["_source"]["highlight"] = hit_item["highlight"]["name"][0]
+            else:
+                hit_item["_source"]["highlight"] = ""
+            ret_list.append(hit_item["_source"])
+
+        return {"tag_list": ret_list}
+    except:
+        logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+        return {"tag_list": []}
+
+
+@bind("physical/search/query_by_tag_type")
+def query_by_tag_type(tag_type_id,offset,size):
+    try:
+        q = {
+            "query":{
+                "bool":{
+                    "must":[
+                        {"term":{"is_online":True}},
+                        {"term": {"is_deleted": False}}
+                    ],
+                    "filter":{"term":{"tag_type": tag_type_id}}
+                }
+            },
+            "sort":[
+                {"near_new_topic_num":{"order":"desc"}}
+            ],
+            "_source": {
+                "include": ["id", "name"]
+            }
+        }
+
+        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"]:
             ret_list.append(hit_item["_source"])
 
         return {"tag_list": ret_list}