git.iko.soy/searx
on master help sign in
fix wikipedia engine and add comments
bb62846Thomas Pointhuber
searx/engines/wikipedia.py+47−10
compare with master
unifiedsplit
@@ -1,30 +1,67 @@
1+## Wikipedia (Web)
2+#
3+# @website http://www.wikipedia.org
4+# @provide-api yes (http://www.mediawiki.org/wiki/API:Search)
5+#
6+# @using-api yes
7+# @results JSON
8+# @stable yes
9+# @parse url, title
10+#
11+# @todo content
12+
1from json import loads
13from json import loads
2from urllib import urlencode, quote
14from urllib import urlencode, quote
3
15
4−url = 'https://{language}.wikipedia.org/'
16+# engine dependent config
5−
17+categories = ['general']
6−search_url = url + 'w/api.php?action=query&list=search&{query}&srprop=timestamp&format=json&sroffset={offset}' # noqa
7−
8−number_of_results = 10
9−
10language_support = True
18language_support = True
19+paging = True
20+number_of_results = 1
21+
22+# search-url
23+url = 'https://{language}.wikipedia.org/'
24+search_url = url + 'w/api.php?action=query&list=search&{query}&srprop=timestamp&format=json&sroffset={offset}&srlimit={limit}' # noqa
11
25
12
26
27+# do search-request
13def request(query, params):
28def request(query, params):
14− offset = (params['pageno'] - 1) * 10
29+ offset = (params['pageno'] - 1) * number_of_results
30+
15 if params['language'] == 'all':
31 if params['language'] == 'all':
16 language = 'en'
32 language = 'en'
17 else:
33 else:
18 language = params['language'].split('_')[0]
34 language = params['language'].split('_')[0]
35+
36+ # write search-language back to params, required in response
19 params['language'] = language
37 params['language'] = language
38+
20 params['url'] = search_url.format(query=urlencode({'srsearch': query}),
39 params['url'] = search_url.format(query=urlencode({'srsearch': query}),
21 offset=offset,
40 offset=offset,
41+ limit=number_of_results,
22 language=language)
42 language=language)
43+
23 return params
44 return params
24
45
25
46
47+# get response from search-request
26def response(resp):
48def response(resp):
49+ results = []
50+
27 search_results = loads(resp.text)
51 search_results = loads(resp.text)
52+
53+ # return empty array if there are no results
28− res = search_results.get('query', {}).get('search', [])
54+ if not search_results.get('query', {}).get('search'):
55+ return []
56+
57+ # parse results
58+ for result in search_results['query']['search']:
29− return [{'url': url.format(language=resp.search_params['language']) + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')), # noqa
59+ res_url = url.format(language=resp.search_params['language']) + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8'))
60+
61+ # append result
62+ results.append({'url': res_url,
30− 'title': result['title']} for result in res[:int(number_of_results)]]
63+ 'title': result['title'],
64+ 'content': ''})
65+
66+ # return results
67+ return results
searx/settings.yml+1−2
@@ -11,9 +11,8 @@ server:
11engines:
11engines:
12 - name : wikipedia
12 - name : wikipedia
13 engine : wikipedia
13 engine : wikipedia
14− number_of_results : 1
15− paging : False
16 shortcut : wp
14 shortcut : wp
15+# number_of_results : 1 # default is 1
17
16
18 - name : bing
17 - name : bing
19 engine : bing
18 engine : bing