Merge branch 'hk' into 'test'

update

See merge request alpha/physical!356

search/utils/topic.py

@@ -370,10 +370,7 @@ class TopicUtils(object):
                 return []
             else:
                 q = dict()
-                q["query"] = dict()
-                # logging.warning("topic_tag_list:%s"%str(topic_tag_list))
-                query_function_score = {
-                        "query": {
+                q["query"] = {
                             "bool": {
                                 "must": [
                                     {"term": {"is_online": True}},
@@ -387,7 +384,23 @@ class TopicUtils(object):
                                 }
                             }
                         }
-                   }
+                # logging.warning("topic_tag_list:%s"%str(topic_tag_list))
+                # query_function_score = {
+                #         "query": {
+                #             "bool": {
+                #                 "must": [
+                #                     {"term": {"is_online": True}},
+                #                     {"term": {"is_deleted": False}},
+                #                     {"terms": {"tag_list": useful_tag_list}}
+                #                 ],
+                #                 "must_not": {
+                #                     "terms": {
+                #                         "id": have_read_topic_list
+                #                     }
+                #                 }
+                #             }
+                #         }
+                #    }
                 q["_source"] = {
                     "includes": ["id"]
                 }