mirror of
				https://github.com/searxng/searxng
				synced 2024-01-01 19:24:07 +01:00 
			
		
		
		
	Merge pull request #932 from a01200356/duckduckgo
[fix] fix duckduckgo's offset
This commit is contained in:
		
						commit
						a932381d7a
					
				
					 2 changed files with 4 additions and 4 deletions
				
			
		|  | @ -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']]) | ||||||
|  |  | ||||||
|  | @ -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' | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Adam Tauber
						Adam Tauber