diff options
| author | Marc Abonce Seguin <marc-abonce@mailbox.org> | 2018-02-28 22:30:48 -0600 |
|---|---|---|
| committer | Marc Abonce Seguin <marc-abonce@mailbox.org> | 2018-03-27 00:08:03 -0600 |
| commit | 772c048d01c7585fd60afca1ce30a1914e6e5b4a (patch) | |
| tree | 96a5662897df2bcf0ab53456e0a67ace998f2169 /searx/engines/wikidata.py | |
| parent | d1eae9359f8c5920632a730744ea2208070f06da (diff) | |
| download | searxng-772c048d01c7585fd60afca1ce30a1914e6e5b4a.tar.gz searxng-772c048d01c7585fd60afca1ce30a1914e6e5b4a.zip | |
refactor engine's search language handling
Add match_language function in utils to match any user given
language code with a list of engine's supported languages.
Also add language_aliases dict on each engine to translate
standard language codes into the custom codes used by the engine.
Diffstat (limited to 'searx/engines/wikidata.py')
| -rw-r--r-- | searx/engines/wikidata.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/searx/engines/wikidata.py b/searx/engines/wikidata.py index 1f31a1f88..1fdbc9869 100644 --- a/searx/engines/wikidata.py +++ b/searx/engines/wikidata.py @@ -16,6 +16,7 @@ from searx.poolrequests import get from searx.engines.xpath import extract_text from searx.engines.wikipedia import _fetch_supported_languages, supported_languages_url from searx.url_utils import urlencode +from searx.utils import match_language from json import loads from lxml.html import fromstring @@ -56,7 +57,7 @@ calendar_name_xpath = './/sup[contains(@class,"wb-calendar-name")]' def request(query, params): - language = params['language'].split('-')[0] + language = match_language(params['language'], supported_languages).split('-')[0] params['url'] = url_search.format( query=urlencode({'label': query, 'language': language})) @@ -68,7 +69,7 @@ def response(resp): html = fromstring(resp.text) wikidata_ids = html.xpath(wikidata_ids_xpath) - language = resp.search_params['language'].split('-')[0] + language = match_language(resp.search_params['language'], supported_languages).split('-')[0] # TODO: make requests asynchronous to avoid timeout when result_count > 1 for wikidata_id in wikidata_ids[:result_count]: |