Merge branch 'change' into 'master'

Change

See merge request !82

trans2es/commons/words_utils.py

@@ -126,7 +126,8 @@ class QueryWordAttr(object):
         try:
             search_info = StrategyHistoryQueryWords.objects.filter(keyword=name).first()
             weight = int(0.0001 * (
-                    search_info.search_num * 0.8 + 0.2 * (search_info.answer_num + search_info.tractate_num + search_info.diary_num)))
+                    search_info.search_num * 0.9 + 0.1 * (
+                        search_info.answer_num + search_info.tractate_num + search_info.diary_num)))
 
             return weight
         except:
@@ -233,13 +234,12 @@ class QueryWordAttr(object):
     @classmethod
     def save_query_to_redis(cls, query, type_v1=False):
         try:
-            return True
             lower_query = str(query).lower()
             key = "save_sub_query_to_redis"
             if type_v1:
                 key = "save_sub_query_to_redis_v1"
             redis_data = redis_client.get(key)
-            redis_client.expire(key, 10 * 60)
+            redis_client.expire(key)
             if redis_data:
                 redis_data = json.loads(str(redis_data, encoding="utf8"))
                 if lower_query in redis_data:

trans2es/utils/search_query.py

@@ -24,10 +24,12 @@ class SearchWord(object):
             if ret_bol:
                 item_dict["id"] = getMd5Digest(keyword)
                 item_dict["ori_name"] = keyword
-                if QueryWordAttr.get_search_query_results_num(keyword):
+                total_num = QueryWordAttr.get_search_query_results_num(keyword)
+                if total_num > 3:
                     is_online = False if instance.is_delete else True
                 else:
                     is_online = False
+
                 item_dict["is_online"] = is_online
                 item_dict["order_weight"] = QueryWordAttr.get_hot_search_query_word_weight(keyword)
                 item_dict["results_num"] = QueryWordAttr.get_search_query_results_num(keyword)