Merge branch 'hk_now' into 'master'

add logging info

See merge request alpha/physical!241

linucb/views/collect_data.py

@@ -75,13 +75,16 @@ class CollectData(object):
 
                 recommend_topic_id_list = list()
                 recommend_topic_id_list_click = list()
+
                 if click_topic_tag_list:
                     if len(click_topic_tag_list)>0:
                      recommend_topic_id_list_click = ESPerform.get_tag_topic_list(click_topic_tag_list,
                                                                                  have_read_topic_id_list)
                 if len(recommend_topic_id_list_click) > 0:
                     num = min(len(recommend_topic_id_list_click), 2)
-                    recommend_topic_id_list.extend(recommend_topic_id_list_click[0:num])
+                    for i in (0,num):
+                        recommend_topic_id_list.append(recommend_topic_id_list_click[i])
+
 
                 tag_topic_id_list = list()
                 tag_id_list = recommend_tag_list[0:100]
@@ -160,9 +163,10 @@ class CollectData(object):
                                 click_topic_tag_list = list()
                                 collection_tag_sql_query_results = TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id=topic_id).values_list("tag_id","is_online","is_collection")
                                 for tag_id,is_online,is_collection in collection_tag_sql_query_results:
-                                    if is_online and is_collection:
+                                    if is_online and is_collection == 1:
                                         click_topic_tag_list.append(tag_id)
 
+                                logging.info("click_topic_tag_list:%"%(str(click_topic_tag_list)))
                                 click_sql_query_results = TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id=topic_id).values_list("tag_id","is_online")
                                 for tag_id,is_online in click_sql_query_results:
                                     if is_online:
@@ -172,6 +176,7 @@ class CollectData(object):
                                         for id, collection, is_ai in tag_sql_query_results:
                                             if (collection == 1 or is_ai == 1) and id not in click_topic_tag_list:
                                                 click_topic_tag_list.append(id)
+                                logging.info("click_topic_tag_list:%"%(str(click_topic_tag_list)))
 
 
                                 is_click = 1

trans2es/models/tag.py

@@ -19,7 +19,7 @@ class TopicTag(models.Model):
     tag_id = models.IntegerField(verbose_name=u"标签ID")
     topic_id = models.IntegerField(verbose_name=u"帖子ID")
     is_online = models.BooleanField(verbose_name=u"是否在线")
-    is_collection = models.BooleanField(verbose_name=u"是否编辑标签")
+    is_collection = models.IntegerField(verbose_name=u"是否编辑标签")