Merge pull request #634 from kvch/advanced-search

support time range search

1 files changed, 10 insertions, 2 deletions

diff --git a/searx/search.py b/searx/search.py
index a40801640..8b8ed4762 100644
--- a/searx/search.py
+++ b/searx/search.py
@@ -138,6 +138,8 @@ class Search(object):
         self.paging = False
         self.pageno = 1
         self.lang = 'all'
+        self.time_range = None
+        self.is_advanced = None
 
         # set blocked engines
         self.disabled_engines = request.preferences.engines.get_disabled()
@@ -178,9 +180,10 @@ class Search(object):
         if len(query_obj.languages):
             self.lang = query_obj.languages[-1]
 
-        self.engines = query_obj.engines
+        self.time_range = self.request_data.get('time_range')
+        self.is_advanced = self.request_data.get('advanced_search')
 
-        self.categories = []
+        self.engines = query_obj.engines
 
         # if engines are calculated from query,
         # set categories by using that informations
@@ -279,6 +282,9 @@ class Search(object):
             if self.lang != 'all' and not engine.language_support:
                 continue
 
+            if self.time_range and not engine.time_range_support:
+                continue
+
             # set default request parameters
             request_params = default_request_params()
             request_params['headers']['User-Agent'] = user_agent
@@ -293,6 +299,8 @@ class Search(object):
 
             # 0 = None, 1 = Moderate, 2 = Strict
             request_params['safesearch'] = request.preferences.get_value('safesearch')
+            request_params['time_range'] = self.time_range
+            request_params['advanced_search'] = self.is_advanced
 
             # update request parameters dependent on
             # search-engine (contained in engines folder)