summaryrefslogtreecommitdiff
path: root/searx/webapp.py
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2016-07-16 21:37:40 +0200
committerAdam Tauber <asciimoo@gmail.com>2016-07-16 21:44:17 +0200
commit485da54961d3cdbc4e3fd33fab90fea6407932ea (patch)
tree2c2ab7607c7a0b5486903db9232c0f5cf911c3a1 /searx/webapp.py
parent9393887eac297fd0007382f62e818a90b283d63b (diff)
[mod][fix] use the average of results number ++ do not display smaller result number than the actual result count - closes #600
Diffstat (limited to 'searx/webapp.py')
-rw-r--r--searx/webapp.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/searx/webapp.py b/searx/webapp.py
index 00a203636..a0a3454f5 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -418,9 +418,13 @@ def index():
else:
result['publishedDate'] = format_date(result['publishedDate'])
+ number_of_results = search.result_container.results_number()
+ if number_of_results < search.result_container.results_length():
+ number_of_results = 0
+
if search.request_data.get('format') == 'json':
return Response(json.dumps({'query': search.query,
- 'number_of_results': search.result_container.number_of_results,
+ 'number_of_results': number_of_results,
'results': search.result_container.get_ordered_results()}),
mimetype='application/json')
elif search.request_data.get('format') == 'csv':
@@ -440,7 +444,7 @@ def index():
'opensearch_response_rss.xml',
results=search.result_container.get_ordered_results(),
q=search.request_data['q'],
- number_of_results=search.result_container.number_of_results,
+ number_of_results=number_of_results,
base_url=get_base_url()
)
return Response(response_rss, mimetype='text/xml')
@@ -451,7 +455,7 @@ def index():
q=search.request_data['q'],
selected_categories=search.categories,
paging=search.paging,
- number_of_results=format_decimal(search.result_container.number_of_results),
+ number_of_results=format_decimal(number_of_results),
pageno=search.pageno,
base_url=get_base_url(),
suggestions=search.result_container.suggestions,