summaryrefslogtreecommitdiff
path: root/searx/webapp.py
diff options
context:
space:
mode:
authorasciimoo <asciimoo@gmail.com>2014-01-19 22:39:56 +0100
committerasciimoo <asciimoo@gmail.com>2014-01-19 22:39:56 +0100
commitbfdd6ebb9292f544736ed264a8d8ab04ca8d0296 (patch)
treea0f0b92552219a46ccc4cd933fd41816144381ca /searx/webapp.py
parentdcbf17f57010b942a29b6a28555ec031eea5cf5b (diff)
parent380b440a55ba3b8ec1430843226fa6b4b0dfe289 (diff)
Merge branch 'featured_result' of https://github.com/pw3t/searx
Diffstat (limited to 'searx/webapp.py')
-rw-r--r--searx/webapp.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/searx/webapp.py b/searx/webapp.py
index ec02e8f5c..52398801e 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -120,6 +120,7 @@ def index():
results, suggestions = search(query, request, selected_engines)
+ featured_results = []
for result in results:
if request_data.get('format', 'html') == 'html':
if 'content' in result:
@@ -134,6 +135,10 @@ def index():
else:
result['pretty_url'] = result['url']
+ for engine in result['engines']:
+ if engine in ['wikipedia', 'youtube', 'vimeo', 'soundcloud', 'twitter', 'stackoverflow', 'github']:
+ result['favicon'] = engine
+
if request_data.get('format') == 'json':
return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json')
elif request_data.get('format') == 'csv':
@@ -162,7 +167,8 @@ def index():
,results=results
,q=request_data['q']
,selected_categories=selected_categories
- ,number_of_results=len(results)
+ ,number_of_results=len(results)+len(featured_results)
+ ,featured_results=featured_results
,suggestions=suggestions
)