git.iko.soy/searx
on master help sign in
add optional request with GET method for search and results pages
commit32e98967b76df8088a5759c90650ae65808932bc authorMatej Cotman <cotman.matej@gmail.com> dateSat 29 Mar 2014, 16:45 (13 years ago) parent879bac8
4 files changed+21−5
compare with master
unifiedsplit
searx/templates/preferences.html+9 searx/templates/results.html+4−4 searx/templates/search.html+1−1 searx/webapp.py+7
searx/templates/preferences.html+9
@@ -43,6 +43,15 @@
4343 </select>
4444 </p>
4545 </fieldset>
46+ <fieldset>
47+ <legend>{{ _('Method') }}</legend>
48+ <p>
49+ <select name='method'>
50+ <option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
51+ <option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
52+ </select>
53+ </p>
54+ </fieldset>
4655 <fieldset>
4756 <legend>{{ _('Currently used search engines') }}</legend>
4857
searx/templates/results.html+4−4
@@ -10,7 +10,7 @@
1010 {% if suggestions %}
1111 <div id="suggestions"><span>{{ _('Suggestions') }}</span>
1212 {% for suggestion in suggestions %}
13− <form method="post" action="{{ url_for('index') }}">
13+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
1414 <input type="hidden" name="q" value="{{ suggestion }}">
1515 <input type="submit" value="{{ suggestion }}" />
1616 </form>
@@ -25,7 +25,7 @@
2525 <div id="apis">
2626 {{ _('Download results') }}
2727 {% for output_type in ('csv', 'json', 'rss') %}
28− <form method="post" action="{{ url_for('index') }}">
28+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
2929 <div class="left">
3030 <input type="hidden" name="q" value="{{ q }}" />
3131 <input type="hidden" name="format" value="{{ output_type }}" />
@@ -52,7 +52,7 @@
5252 {% if paging %}
5353 <div id="pagination">
5454 {% if pageno > 1 %}
55− <form method="post" action="{{ url_for('index') }}">
55+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
5656 <div class="left">
5757 <input type="hidden" name="q" value="{{ q }}" />
5858 {% for category in selected_categories %}
@@ -63,7 +63,7 @@
6363 </div>
6464 </form>
6565 {% endif %}
66− <form method="post" action="{{ url_for('index') }}">
66+ <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
6767 <div class="left">
6868 {% for category in selected_categories %}
6969 <input type="hidden" name="category_{{ category }}" value="1"/>
searx/templates/search.html+1−1
@@ -1,4 +1,4 @@
1−<form method="post" action="{{ url_for('index') }}" id="search_form">
1+<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
22 <div id="search_wrapper">
33 <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
44 <input type="submit" value="search" id="search_submit" />
searx/webapp.py+7
@@ -123,6 +123,8 @@ def render(template_name, **kwargs):
123123 if not 'autocomplete' in kwargs:
124124 kwargs['autocomplete'] = autocomplete
125125
126+ kwargs['method'] = request.cookies.get('method', 'POST')
127+
126128 return render_template(template_name, **kwargs)
127129
128130
@@ -295,6 +297,7 @@ def preferences():
295297 selected_categories = []
296298 locale = None
297299 autocomplete = ''
300+ method = 'POST'
298301 for pd_name, pd in request.form.items():
299302 if pd_name.startswith('category_'):
300303 category = pd_name[9:]
@@ -309,6 +312,8 @@ def preferences():
309312 pd in (x[0] for
310313 x in language_codes)):
311314 lang = pd
315+ elif pd_name == 'method':
316+ method = pd
312317 elif pd_name.startswith('engine_'):
313318 engine_name = pd_name.replace('engine_', '', 1)
314319 if engine_name in engines:
@@ -348,6 +353,8 @@ def preferences():
348353 max_age=cookie_max_age
349354 )
350355
356+ resp.set_cookie('method', method, max_age=cookie_max_age)
357+
351358 return resp
352359 return render('preferences.html',
353360 locales=settings['locales'],