diff options
| author | d-tux <deniswernert@gmail.com> | 2019-01-08 09:24:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-08 09:24:45 +0100 |
| commit | 329172f66e7ad066f7cdd24db5d414c816ad8a80 (patch) | |
| tree | 426482bdcb8f5fd0b2f5e983ae4a0bbb17fc21d9 /searx/engines/duckduckgo.py | |
| parent | 4a127b19de860a1f1e75f597dc0d53bfdd06e52e (diff) | |
| parent | 2438b3c77a3ad276aaeb15e5a54315d351a42273 (diff) | |
Merge branch 'master' into engines/unsplash
Diffstat (limited to 'searx/engines/duckduckgo.py')
| -rw-r--r-- | searx/engines/duckduckgo.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py index 2c5dc50d8..fb8f523ac 100644 --- a/searx/engines/duckduckgo.py +++ b/searx/engines/duckduckgo.py @@ -54,6 +54,9 @@ content_xpath = './/a[@class="result__snippet"]' # match query's language to a region code that duckduckgo will accept def get_region_code(lang, lang_list=[]): + if lang == 'all': + return None + lang_code = match_language(lang, lang_list, language_aliases, 'wt-WT') lang_parts = lang_code.split('-') @@ -61,7 +64,6 @@ def get_region_code(lang, lang_list=[]): return lang_parts[1].lower() + '-' + lang_parts[0].lower() -# do search-request def request(query, params): if params['time_range'] and params['time_range'] not in time_range_dict: return params @@ -69,8 +71,12 @@ def request(query, params): offset = (params['pageno'] - 1) * 30 region_code = get_region_code(params['language'], supported_languages) - params['url'] = url.format( - query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset) + if region_code: + params['url'] = url.format( + query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset) + else: + params['url'] = url.format( + query=urlencode({'q': query}), offset=offset, dc_param=offset) if params['time_range'] in time_range_dict: params['url'] += time_range_url.format(range=time_range_dict[params['time_range']]) |