git.iko.soy/searx
on master help sign in
[fix] bing paging and language support

see https://msdn.microsoft.com/en-us/library/ff795620.aspx for bing specific search operators closes #755

commit16ff8d06c73d3e0ec784e8c9a1fb38b36a95d8fb authorAdam Tauber <asciimoo@gmail.com> dateMon 7 Nov 2016, 22:30 (10 years ago) parent7d26b3f
2 files changed+5−12
compare with master
unifiedsplit
searx/engines/bing.py+3−8 tests/unit/engines/test_bing.py+2−4
searx/engines/bing.py+3−8
@@ -32,18 +32,13 @@ search_string = 'search?{query}&first={offset}'
3232def request(query, params):
3333 offset = (params['pageno'] - 1) * 10 + 1
3434
35− if params['language'] == 'all':
36− language = 'en-US'
37− else:
38− language = params['language'].replace('_', '-')
35+ if params['language'] != 'all':
36+ query = 'language:{} {}'.format(params['language'].split('_')[0].upper(), query)
3937
4038 search_path = search_string.format(
41− query=urlencode({'q': query, 'setmkt': language}),
39+ query=urlencode({'q': query}),
4240 offset=offset)
4341
44− params['cookies']['SRCHHPGUSR'] = \
45− 'NEWWND=0&NRSLT=-1&SRCHLANG=' + language.split('-')[0]
46−
4742 params['url'] = base_url + search_path
4843 return params
4944
tests/unit/engines/test_bing.py+2−4
@@ -14,14 +14,12 @@ class TestBingEngine(SearxTestCase):
1414 params = bing.request(query, dicto)
1515 self.assertTrue('url' in params)
1616 self.assertTrue(query in params['url'])
17+ self.assertTrue('language%3AFR' in params['url'])
1718 self.assertTrue('bing.com' in params['url'])
18− self.assertTrue('SRCHHPGUSR' in params['cookies'])
19− self.assertTrue('fr' in params['cookies']['SRCHHPGUSR'])
2019
2120 dicto['language'] = 'all'
2221 params = bing.request(query, dicto)
23− self.assertTrue('SRCHHPGUSR' in params['cookies'])
24− self.assertTrue('en' in params['cookies']['SRCHHPGUSR'])
22+ self.assertTrue('language' not in params['url'])
2523
2624 def test_response(self):
2725 self.assertRaises(AttributeError, bing.response, None)