Merge branch 'master' into hk

search/views/topic.py

@@ -78,6 +78,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         user_similar_score_redis_list = json.loads(
             redis_user_similar_score_redis_val) if redis_user_similar_score_redis_val else []
 
+        attention_tag_list = list()
         recommend_topic_list = list()
         if query is None:
             # linucb 推荐帖子
@@ -110,7 +111,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             #     have_read_topic_id_list_add_promote.append(topic_id)
 
         topic_id_list = list()
-        rank_topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=offset, size=size,
+        rank_topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=0, size=size,
                                                            single_size=size,query=query, query_type=query_type,
                                                            filter_topic_id_list=have_read_topic_id_list,
                                                            user_similar_score_list=user_similar_score_redis_list,index_type="topic",routing="4,5,6",attention_tag_list=attention_tag_list)
@@ -243,7 +244,7 @@ def home_query(device_id="", tag_id=-1, user_id=-1, query="", offset=0, size=10)
         if not isinstance(device_id, str):
             device_id = ""
 
-        recommend_topic_ids = get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query)
+        recommend_topic_ids = get_home_recommend_topic_ids(user_id, device_id, tag_id, offset=offset, size=size, query=query)
         return {"recommend_topic_ids": recommend_topic_ids}
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())