Icycoide/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng.git synced 2025-07-23 13:19:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'featured_result' of https://github.com/pw3t/searx

Browse source
This commit is contained in:
asciimoo 2014-01-19 22:39:56 +01:00
commit bfdd6ebb92
15 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
searx/webapp.py
View file

@ -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
)