add

search/utils/group.py

@@ -68,9 +68,7 @@ class GroupUtils(object):
             q["_source"] = {
                 "includes": ["id"]
             }
-            MAX_LOAD = 100
-            sizes = max(size, MAX_LOAD)
-            result_dict = ESPerform.get_search_results(es_cli_obj, "pictorial", q, offset, sizes)
+            result_dict = ESPerform.get_search_results(es_cli_obj, "pictorial", q, offset, size)
 
             pictorial_ids_list = []
             if len(result_dict["hits"]) > 0:
@@ -79,7 +77,7 @@ class GroupUtils(object):
             pictorial_del_ids_list = []
             if len(pictorial_ids_list) > 0:
                 for id in pictorial_ids_list:
-                    q ={
+                    q = {
                         "query": {
                             "bool": {
                                 "must": [{
@@ -88,7 +86,7 @@ class GroupUtils(object):
                                     }
                                 }, {
                                     "terms": {
-                                        "content_level": [3, 4, 5,0]
+                                        "content_level": [3, 4, 5, 0]
                                     }
                                 }, {
                                     "term": {
@@ -115,7 +113,6 @@ class GroupUtils(object):
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return []
 
-
     @classmethod
     def get_user_attention_pictorial_list(cls, user_id, offset=0, size=10, es_cli_obj=None):
         """
@@ -139,10 +136,10 @@ class GroupUtils(object):
             q["_source"] = {
                 "includes": ["attention_pictorial_id_list"]
             }
-            MAX_LOAD = 100
-            sizes = max(size, MAX_LOAD)
+            # MAX_LOAD = 100
+            # sizes = max(size, MAX_LOAD)
 
-            result_dict = ESPerform.get_search_results(es_cli_obj, "user", q, offset, sizes)
+            result_dict = ESPerform.get_search_results(es_cli_obj, "user", q, offset, size)
             pictorial_ids_list = []
             if len(result_dict["hits"]) > 0:
                 pictorial_ids_list = result_dict["hits"][0]["_source"]["attention_pictorial_id_list"]
@@ -159,7 +156,7 @@ class GroupUtils(object):
                                     }
                                 }, {
                                     "terms": {
-                                        "content_level": [3, 4, 5,0]
+                                        "content_level": [3, 4, 5, 0]
                                     }
                                 }, {
                                     "term": {
@@ -187,7 +184,6 @@ class GroupUtils(object):
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return []
 
-
     @classmethod
     def get_pictorial_ids_by_aggs(cls, pictorial_ids_list, es_cli_obj=None):
         """