a932381 · searx · git.iko.soy

Merge pull request #932 from a01200356/duckduckgo

[fix] fix duckduckgo's offset

commita932381d7afd84e4ff5b5dab5f306328fb0487c7 authorAdam Tauber <asciimoo@gmail.com> dateThu 1 Jun 2017, 12:01 (9 years ago) parentc65a409 3b95092

2 files changed+4−4

unifiedsplit

searx/engines/duckduckgo.py+3−4

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

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

8080 return params

8181

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

83− dc_param = offset + 1

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

8483

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

8685 if region_code:

8786 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)

8988 else:

9089 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)

9291

9392 if params['time_range'] in time_range_dict:

9493 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):

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

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

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

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

2122

2223 # when ddg uses non standard code

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