3b95092 · searx · git.iko.soy

on master help sign in

[fix] fix duckduckgo's offset

3b95092marc9 years ago

searx/engines/duckduckgo.py+3−4

@@ -79,16 +79,15 @@ def request(query, params):

79 if params['time_range'] and params['time_range'] not in time_range_dict:

80 return params

82− offset = 30 + (params['pageno'] - 1) * 50

82+ offset = (params['pageno'] - 1) * 30

83− dc_param = offset + 1

85 region_code = get_region_code(params['language'])

84 region_code = get_region_code(params['language'])

86 if region_code:

85 if region_code:

87 params['url'] = url.format(

86 params['url'] = url.format(

88− query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=dc_param)

87+ query=urlencode({'q': query, 'kl': region_code}), offset=offset, dc_param=offset)

89 else:

88 else:

90 params['url'] = url.format(

89 params['url'] = url.format(

91− query=urlencode({'q': query}), offset=offset, dc_param=dc_param)

90+ query=urlencode({'q': query}), offset=offset, dc_param=offset)

93 if params['time_range'] in time_range_dict:

92 if params['time_range'] in time_range_dict:

94 params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])

93 params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])

tests/unit/engines/test_duckduckgo.py+1

@@ -18,6 +18,7 @@ class TestDuckduckgoEngine(SearxTestCase):

18 self.assertIn(query, params['url'])

19 self.assertIn('duckduckgo.com', params['url'])

20 self.assertIn('ch-de', params['url'])

21+ self.assertIn('s=0', params['url'])

22 # when ddg uses non standard code

23 # when ddg uses non standard code

23 dicto['language'] = 'en-GB'

24 dicto['language'] = 'en-GB'