modify linucb es bug

libs/es.py

@@ -276,18 +276,22 @@ class ESPerform(object):
                 )
             q = {
                 "query":{
-                    "bool":{
-                        "must":[
-                            {"range": {"content_level": {"gte": 3, "lte": 5}}},
-                            {"term":{"is_online": True}},
-                            {"term":{"is_deleted": False}},
-                            {"terms":{"tag_list":tag_id}}
-                        ]
+                    "function_score":{
+                        "query": {
+                            "bool": {
+                                "must": [
+                                    {"range": {"content_level": {"gte": 3, "lte": 5}}},
+                                    {"term": {"is_online": True}},
+                                    {"term": {"is_deleted": False}},
+                                    {"terms": {"tag_list": tag_id}}
+                                ]
+                            }
+                        },
+                        "boost_mode": "sum",
+                        "score_mode": "sum",
+                        "functions": functions_list
                     }
                 },
-                "boost_mode": "sum",
-                "score_mode": "sum",
-                "functions": functions_list,
                 "_source":{
                     "include":["id"]
                 },
@@ -298,7 +302,11 @@ class ESPerform(object):
                 ]
             }
             if len(have_read_topic_id_list)>0:
-                q["query"]["bool"]["must_not"] = have_read_topic_id_list
+                q["query"]["bool"]["must_not"] = {
+                    "terms":{
+                        "id":have_read_topic_id_list
+                    }
+                }
             result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name="topic", query_body=q,
                                                        offset=0, size=100,routing="3,4,5")
 

search/views/tag.py

@@ -24,34 +24,6 @@ def get_highlight(fields=[]):
 @bind("physical/search/query_tag")
 def query_tag(query,offset,size):
     try:
-        """
-        q = {
-            "query":{
-                "bool":{
-                    "must":[
-                        {"term":{"is_online":True}},
-                        {"term": {"is_deleted": False}}
-                    ],
-                    "should":[
-                        {"multi_match":{
-                            "query": query,
-                            "fields":["name"],
-                            "operator":"and"}}
-                    ],
-                    "minimum_should_match":1
-                }
-            },
-            "sort":[
-                {"near_new_topic_num":{"order":"desc"}},
-                {'_score': {"order": "desc"}}
-            ],
-            "_source": {
-                "includes": ["id", "name"]
-            }
-        }
-        q["highlight"] = get_highlight(["name"])            
-        """
-
         q = {
             "suggest":{
                     "tips-suggest":{
@@ -121,3 +93,11 @@ def query_by_tag_type(tag_type_id,offset,size):
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
         return {"tag_list": []}
 
+
+@bind("physical/search/choice_push_tag")
+def choice_push_tag(device_id,user_id):
+    try:
+        pass
+    except:
+        logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+        return {"tag_list": []}