ca271fd · searx · git.iko.soy

[enh] bing, google paging support

commitca271fd8617db722015f629832ed44a845ab73ed authorasciimoo <asciimoo@gmail.com> dateWed 29 Jan 2014, 21:14 (13 years ago) parent8bb94e3

2 files changed+12−4

unifiedsplit

searx/engines/bing.py+6−2

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

33from cgi import escape

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

6−search_string = 'search?{query}'

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

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

9+paging = True

10+

911

1012def request(query, params):

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

1114 search_path = search_string.format(

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

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

16+ offset=offset)

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

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

1519 params['url'] = base_url + search_path

searx/engines/google.py+6−2

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

66categories = ['general']

8+paging = True

810url = '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

1012

1113

1214def request(query, params):

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

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

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

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

1418 return params

1519

1620