modify

search/utils/topic.py

@@ -132,20 +132,6 @@ class TopicUtils(object):
 
             q = dict()
             q["query"] = dict()
-            """
-            q["filter"] = {
-                "range": {"content_level": {"gte": 3, "lte": 5}}
-            }            
-            if not is_first_time:
-                if group_topic_ids_index:
-                    q["filter"]["range"]["group_id"] = {
-                        "gt": 0
-                    }
-                else:
-                    q["filter"]["range"]["group_id"] = {
-                        "lt": 0
-                    }            
-            """
 
             attention_user_id_term_list = cls.___get_should_term_list(attention_chinese_user_id_list + attention_japan_user_id_list + attention_korea_user_id_list)
             pick_user_id_term_list = cls.___get_should_term_list(pick_chinese_user_id_list + pick_japan_user_id_list + pick_korea_user_id_list)
@@ -183,8 +169,6 @@ class TopicUtils(object):
                 "functions": functions_list
             }
 
-            q["query"]["function_score"] = query_function_score
-
             if query is not None:#搜索帖子
                 multi_fields = {
                     'description': 2,
@@ -206,7 +190,16 @@ class TopicUtils(object):
                     "minimum_should_match": 1
                 }                
                 """
-
+            if not is_first_time:
+                if group_topic_ids_index:
+                    query_function_score["query"]["bool"]["must"]["range"]["group_id"] = {
+                        "gt": 0
+                    }
+                else:
+                    query_function_score["query"]["bool"]["must"]["range"]["group_id"] = {
+                        "lt": 0
+                    }
+            q["query"]["function_score"] = query_function_score
             q["_source"] = {
                 "include":["id","group_id"]
             }
@@ -214,10 +207,15 @@ class TopicUtils(object):
             logging.info("duan add,es query:%s" % str(q).encode("utf-8"))
             result_dict = ESPerform.get_search_results(ESPerform.get_cli(), sub_index_name="topic", query_body=q,
                                                        offset=offset, size=size)
-            logging.info("result_dict:%s" % str(result_dict).encode("utf-8"))
             group_topic_ids = list()
             not_group_topic_ids = list()
 
+            """
+            q["filter"] = {
+                "range": {"content_level": {"gte": 3, "lte": 5}}
+            }            
+         
+            """
             for item in result_dict["hits"]:
                 if item["_source"]["group_id"] and item["_source"]["group_id"]> 0:
                     group_topic_ids.append(item["_source"]["id"])