update

find_source/crawler/services/query.py

@@ -15,20 +15,13 @@ from crawler.utils import (
 
 class QueryKeyWord(BasicSearch):
 
-    def __init__(
-            self,
-            engine=None,
-            query_workers=1,
-            max_query_page=1,
-            loop_query_interval=60,
-            **kwargs
-    ):
+    def __init__(self, engine=None, **kwargs):
+        self._workers = (kwargs.pop('query_workers', None) or 1)
+        self._max_pages = (kwargs.pop('max_pages', None) or 1)
+        self._interval = (kwargs.pop('query_interval', None) or 60)
         super(QueryKeyWord, self).__init__(**kwargs)
         self.engine = (engine or BingSearchEngine())
         self._name = engine.__class__.__name__
-        self._workers = query_workers
-        self._max_pages = max_query_page
-        self._interval = loop_query_interval
 
     def query_keyword(self):
         t_name = threading.currentThread().getName()
@@ -76,18 +69,12 @@ class QueryKeyWord(BasicSearch):
 
 class QueryOrganization(BasicSearch):
 
-    def __init__(
-            self,
-            engine=None,
-            query_workers=1,
-            loop_query_interval=60,
-            **kwargs
-    ):
+    def __init__(self, engine=None, **kwargs):
+        self._workers = (kwargs.pop('query_workers', None) or 1)
+        self._interval = (kwargs.pop('query_interval', None) or 60)
         super(QueryOrganization, self).__init__(**kwargs)
         self.engine = (engine or QccSearchEngine())
         self._name = engine.__class__.__name__
-        self._workers = query_workers
-        self._interval = loop_query_interval
 
     def query_org(self):
         t_name = threading.currentThread().getName()