zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #932 from a01200356/duckduckgo 

[fix] fix duckduckgo's offset
This commit is contained in:
Adam Tauber 2017-06-01 12:01:32 +02:00 committed by GitHub
parent c65a409f0d 3b950929b1
commit a932381d7a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
searx/engines/duckduckgo.py
View File

@ -79,16 +79,15 @@ def request(query, params):
if params['time_range'] and params['time_range'] not in time_range_dict: if params['time_range'] and params['time_range'] not in time_range_dict:
return params return params
offset = 30 + (params['pageno'] - 1) * 50 offset = (params['pageno'] - 1) * 30
dc_param = offset + 1
region_code = get_region_code(params['language']) region_code = get_region_code(params['language'])
if region_code: if region_code:
params['url'] = url.format( params['url'] = url.format(
query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=dc_param) query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)
else: else:
params['url'] = url.format( params['url'] = url.format(
query=urlencode({'q': query}), offset=offset, dc_param=dc_param) query=urlencode({'q': query}), offset=offset, dc_param=offset)
if params['time_range'] in time_range_dict: if params['time_range'] in time_range_dict:
params['url'] += time_range_url.format(range=time_range_dict[params['time_range']]) params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])

1
tests/unit/engines/test_duckduckgo.py
View File

@ -18,6 +18,7 @@ class TestDuckduckgoEngine(SearxTestCase):
self.assertIn(query, params['url']) self.assertIn(query, params['url'])
self.assertIn('duckduckgo.com', params['url']) self.assertIn('duckduckgo.com', params['url'])
self.assertIn('ch-de', params['url']) self.assertIn('ch-de', params['url'])
self.assertIn('s=0', params['url'])
# when ddg uses non standard code # when ddg uses non standard code
dicto['language'] = 'en-GB' dicto['language'] = 'en-GB'