16a8641 · searx · git.iko.soy

searx/search.py+3

compare with master

unifiedsplit

@@ -139,6 +139,7 @@ class Search(object):

139 self.pageno = 1

140 self.lang = 'all'

141 self.time_range = None

142+ self.is_advanced = None

142

143

143 # set blocked engines

144 # set blocked engines

144 self.disabled_engines = request.preferences.engines.get_disabled()

145 self.disabled_engines = request.preferences.engines.get_disabled()

@@ -180,6 +181,7 @@ class Search(object):

180 self.lang = query_obj.languages[-1]

181 self.lang = query_obj.languages[-1]

181

182

182 self.time_range = self.request_data.get('time_range')

183 self.time_range = self.request_data.get('time_range')

184+ self.is_advanced = self.request_data.get('advanced_search')

183

185

184 self.engines = query_obj.engines

186 self.engines = query_obj.engines

185

187

@@ -298,6 +300,7 @@ class Search(object):

298 # 0 = None, 1 = Moderate, 2 = Strict

300 # 0 = None, 1 = Moderate, 2 = Strict

299 request_params['safesearch'] = request.preferences.get_value('safesearch')

301 request_params['safesearch'] = request.preferences.get_value('safesearch')

300 request_params['time_range'] = self.time_range

302 request_params['time_range'] = self.time_range

303+ request_params['advanced_search'] = self.is_advanced

301

304

302 # update request parameters dependent on

305 # update request parameters dependent on

303 # search-engine (contained in engines folder)

306 # search-engine (contained in engines folder)

searx/templates/oscar/advanced.html+1−1

@@ -1,5 +1,5 @@

1<div class="input-group col-sm-12 advanced">

2− <input type="checkbox" id="check-advanced">

2+ <input type="checkbox" name="advanced_search" id="check-advanced" {% if advanced_search %} checked="checked"{% endif %}>

3 <label for="check-advanced">

4 <span class="glyphicon glyphicon-cog"></span>

5 {{ _('Advanced settings') }}

searx/webapp.py+1

@@ -459,6 +459,7 @@ def index():

459 paging=search.paging,

460 number_of_results=format_decimal(number_of_results),

461 pageno=search.pageno,

462+ advanced_search=search.is_advanced,

462 time_range=search.time_range,

463 time_range=search.time_range,

463 base_url=get_base_url(),

464 base_url=get_base_url(),

464 suggestions=search.result_container.suggestions,

465 suggestions=search.result_container.suggestions,