Merge branch 'dev' into 'master'

Dev

See merge request alpha/physical!58

search/views/tag.py

@@ -39,6 +39,7 @@ 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"]
             ret_list.append(hit_item["_source"])
 
         return {"tag_list": ret_list}

trans2es/mapping/tag.json

@@ -3,6 +3,6 @@
   "properties": {
     "id":{"type":"long"},
     "suggest":{"type":"completion"},
-    "name":{"type":"text","analyzer":"gm_default_index","search_analyzer":"keyword"}
+    "name":{"type":"text","analyzer":"gm_default_index","search_analyzer":"standard"}
   }
 }
\ No newline at end of file