|
@@ -418,9 +418,13 @@ def index():
|
418
|
418
|
else:
|
419
|
419
|
result['publishedDate'] = format_date(result['publishedDate'])
|
420
|
420
|
|
|
421
|
+ number_of_results = search.result_container.results_number()
|
|
422
|
+ if number_of_results < search.result_container.results_length():
|
|
423
|
+ number_of_results = 0
|
|
424
|
+
|
421
|
425
|
if search.request_data.get('format') == 'json':
|
422
|
426
|
return Response(json.dumps({'query': search.query,
|
423
|
|
- 'number_of_results': search.result_container.number_of_results,
|
|
427
|
+ 'number_of_results': number_of_results,
|
424
|
428
|
'results': search.result_container.get_ordered_results()}),
|
425
|
429
|
mimetype='application/json')
|
426
|
430
|
elif search.request_data.get('format') == 'csv':
|
|
@@ -440,7 +444,7 @@ def index():
|
440
|
444
|
'opensearch_response_rss.xml',
|
441
|
445
|
results=search.result_container.get_ordered_results(),
|
442
|
446
|
q=search.request_data['q'],
|
443
|
|
- number_of_results=search.result_container.number_of_results,
|
|
447
|
+ number_of_results=number_of_results,
|
444
|
448
|
base_url=get_base_url()
|
445
|
449
|
)
|
446
|
450
|
return Response(response_rss, mimetype='text/xml')
|
|
@@ -451,7 +455,7 @@ def index():
|
451
|
455
|
q=search.request_data['q'],
|
452
|
456
|
selected_categories=search.categories,
|
453
|
457
|
paging=search.paging,
|
454
|
|
- number_of_results=format_decimal(search.result_container.number_of_results),
|
|
458
|
+ number_of_results=format_decimal(number_of_results),
|
455
|
459
|
pageno=search.pageno,
|
456
|
460
|
base_url=get_base_url(),
|
457
|
461
|
suggestions=search.result_container.suggestions,
|