git.iko.soy/searx
on master help sign in
[enh] display number of results
commit2f7752b410c449aac463c248c0b7e41f69b6b07b authorAdam Tauber <asciimoo@gmail.com> dateTue 28 Jun 2016, 00:06 (10 years ago) parent36c8977
5 files changed+31−6
compare with master
unifiedsplit
searx/engines/bing.py+6−4 searx/engines/yahoo.py+7 searx/results.py+4 searx/templates/oscar/results.html+10 searx/webapp.py+4−2
searx/engines/bing.py+6−4
@@ -54,6 +54,12 @@ def response(resp):
5454
5555 dom = html.fromstring(resp.text)
5656
57+ try:
58+ results.append({'number_of_results': int(dom.xpath('//span[@class="sb_count"]/text()')[0]
59+ .split()[0].replace(',', ''))})
60+ except:
61+ pass
62+
5763 # parse results
5864 for result in dom.xpath('//div[@class="sa_cc"]'):
5965 link = result.xpath('.//h3/a')[0]
@@ -66,10 +72,6 @@ def response(resp):
6672 'title': title,
6773 'content': content})
6874
69− # return results if something is found
70− if results:
71− return results
72−
7375 # parse results again if nothing is found yet
7476 for result in dom.xpath('//li[@class="b_algo"]'):
7577 link = result.xpath('.//h2/a')[0]
searx/engines/yahoo.py+7
@@ -77,6 +77,13 @@ def response(resp):
7777
7878 dom = html.fromstring(resp.text)
7979
80+ try:
81+ results_num = int(dom.xpath('//div[@class="compPagination"]/span[last()]/text()')[0]
82+ .split()[0].replace(',', ''))
83+ results.append({'number_of_results': results_num})
84+ except:
85+ pass
86+
8087 # parse results
8188 for result in dom.xpath(results_xpath):
8289 try:
searx/results.py+4
@@ -99,6 +99,7 @@ class ResultContainer(object):
9999 self._infobox_ids = {}
100100 self.suggestions = set()
101101 self.answers = set()
102+ self.number_of_results = 0
102103
103104 def extend(self, engine_name, results):
104105 for result in list(results):
@@ -111,6 +112,9 @@ class ResultContainer(object):
111112 elif 'infobox' in result:
112113 self._merge_infobox(result)
113114 results.remove(result)
115+ elif 'number_of_results' in result:
116+ self.number_of_results = max(self.number_of_results, result['number_of_results'])
117+ results.remove(result)
114118
115119 with RLock():
116120 engines[engine_name].stats['search_count'] += 1
searx/templates/oscar/results.html+10
@@ -78,6 +78,16 @@
7878 </div><!-- /#main_results -->
7979
8080 <div class="col-sm-4" id="sidebar_results">
81+ {% if number_of_results %}
82+ <div class="panel panel-default">
83+ <div class="panel-heading">
84+ <h4 class="panel-title">{{ _('Number of results') }}</h4>
85+ </div>
86+ <div class="panel-body">
87+ {{ number_of_results }}
88+ </div>
89+ </div>
90+ {% endif %}
8191 {% if infoboxes %}
8292 {% for infobox in infoboxes %}
8393 {% include 'oscar/infobox.html' %}
searx/webapp.py+4−2
@@ -48,7 +48,7 @@ from flask import (
4848 Flask, request, render_template, url_for, Response, make_response,
4949 redirect, send_from_directory
5050)
51−from flask.ext.babel import Babel, gettext, format_date
51+from flask.ext.babel import Babel, gettext, format_date, format_decimal
5252from flask.json import jsonify
5353from searx import settings, searx_dir
5454from searx.engines import (
@@ -420,6 +420,7 @@ def index():
420420
421421 if search.request_data.get('format') == 'json':
422422 return Response(json.dumps({'query': search.query,
423+ 'number_of_results': search.result_container.number_of_results,
423424 'results': search.result_container.get_ordered_results()}),
424425 mimetype='application/json')
425426 elif search.request_data.get('format') == 'csv':
@@ -439,7 +440,7 @@ def index():
439440 'opensearch_response_rss.xml',
440441 results=search.result_container.get_ordered_results(),
441442 q=search.request_data['q'],
442− number_of_results=search.result_container.results_length(),
443+ number_of_results=search.result_container.number_of_results,
443444 base_url=get_base_url()
444445 )
445446 return Response(response_rss, mimetype='text/xml')
@@ -450,6 +451,7 @@ def index():
450451 q=search.request_data['q'],
451452 selected_categories=search.categories,
452453 paging=search.paging,
454+ number_of_results=format_decimal(search.result_container.number_of_results),
453455 pageno=search.pageno,
454456 base_url=get_base_url(),
455457 suggestions=search.result_container.suggestions,