ca271fd · searx · git.iko.soy

on master help sign in

[enh] bing, google paging support

ca271fdasciimoo13 years ago

searx/engines/bing.py+6−2

@@ -3,13 +3,17 @@ from urllib import urlencode

3from cgi import escape

5base_url = 'http://www.bing.com/'

6−search_string = 'search?{query}'

6+search_string = 'search?{query}&first={offset}'

7locale = 'en-US' # see http://msdn.microsoft.com/en-us/library/dd251064.aspx

9+paging = True

10+

10def request(query, params):

12def request(query, params):

13+ offset = (params['pageno'] - 1) * 10 + 1

11 search_path = search_string.format(

14 search_path = search_string.format(

12− query=urlencode({'q': query, 'setmkt': locale}))

15+ query=urlencode({'q': query, 'setmkt': locale}),

16+ offset=offset)

13 #if params['category'] == 'images':

17 #if params['category'] == 'images':

14 # params['url'] = base_url + 'images/' + search_path

18 # params['url'] = base_url + 'images/' + search_path

15 params['url'] = base_url + search_path

19 params['url'] = base_url + search_path

searx/engines/google.py+6−2

@@ -5,12 +5,16 @@ from json import loads

6categories = ['general']

8+paging = True

8url = 'https://ajax.googleapis.com/'

10url = 'https://ajax.googleapis.com/'

9−search_url = url + 'ajax/services/search/web?v=1.0&start=0&rsz=large&safe=off&filter=off&{query}' # noqa

11+search_url = url + 'ajax/services/search/web?v=1.0&start={offset}&rsz=large&safe=off&filter=off&{query}' # noqa

12def request(query, params):

14def request(query, params):

15+ offset = (params['pageno'] - 1) * 8

16+ params['url'] = search_url.format(offset=offset,

13− params['url'] = search_url.format(query=urlencode({'q': query}))

17+ query=urlencode({'q': query}))

14 return params

18 return params