Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical

linucb/views/collect_data.py

@@ -103,7 +103,14 @@ class CollectData(object):
 
                 if len(recommend_topic_id_list)==0 and cursor==0 and len(redis_topic_list)>0:
                     have_read_topic_id_list.extend(redis_topic_list[:2])
-                tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id_list,have_read_topic_id_list)
+                if len(tag_id_list) > 0:
+                 if len(new_user_click_tag_list)>0:
+                     tag_topic_id_list = ESPerform.get_tag_topic_list(new_user_click_tag_list, have_read_topic_id_list)
+                     logging.warning("tag_topic_id_list:%s" % str(new_user_click_tag_list))
+                     logging.warning("tag_id_list:%s" % str(tag_id_list))
+                 else:
+                     tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id_list,have_read_topic_id_list)
+
 
                 if len(recommend_topic_id_list)>0 or len(new_user_click_tag_list) > 0:
                     tag_topic_id_list = recommend_topic_id_list + tag_topic_id_list
@@ -195,7 +202,7 @@ class CollectData(object):
                                     exposure_cards_list = list()
                                 device_id = raw_val_dict["device"]["device_id"]
                                 user_id = raw_val_dict["user_id"] if "user_id" in raw_val_dict else None
-
+                                logging.warning("type msg:%s" % raw_val_dict.get("type"))
                                 exposure_topic_id_list = list()
                                 for item in exposure_cards_list:
                                     if "card_id" not in item:
@@ -243,8 +250,9 @@ class CollectData(object):
                                     tagid_list = raw_val_dict["params"]["tagid_list"]
                                 else:
                                     tagid_list = list()
+                                logging.warning("unknown type msg:%s" % raw_val_dict.get("type", "missing type"))
                                 logging.info(
-                                    "consume topic_id:%s,device_id:%s" % (
+                                    "consume click topic_id:%s,device_id:%s" % (
                                     str(tagid_list), str(device_id)))
                                 device_id = raw_val_dict["device"]["device_id"]
                                 user_id = raw_val_dict["user_id"] if "user_id" in raw_val_dict else None