zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[enh] bing, google paging support

This commit is contained in:
asciimoo 2014-01-29 21:14:38 +01:00
parent 8bb94e3dc4
commit ca271fd861
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
searx/engines/bing.py
View File

@ -3,13 +3,17 @@ from urllib import urlencode
from cgi import escape from cgi import escape
base_url = 'http://www.bing.com/' base_url = 'http://www.bing.com/'
search_string = 'search?{query}' search_string = 'search?{query}&first={offset}'
locale = 'en-US' # see http://msdn.microsoft.com/en-us/library/dd251064.aspx locale = 'en-US' # see http://msdn.microsoft.com/en-us/library/dd251064.aspx
paging = True
def request(query, params): def request(query, params):
offset = (params['pageno'] - 1) * 10 + 1
search_path = search_string.format( search_path = search_string.format(
query=urlencode({'q': query, 'setmkt': locale})) query=urlencode({'q': query, 'setmkt': locale}),
offset=offset)
#if params['category'] == 'images': #if params['category'] == 'images':
# params['url'] = base_url + 'images/' + search_path # params['url'] = base_url + 'images/' + search_path
params['url'] = base_url + search_path params['url'] = base_url + search_path

8
searx/engines/google.py
View File

@ -5,12 +5,16 @@ from json import loads
categories = ['general'] categories = ['general']
paging = True
url = 'https://ajax.googleapis.com/' url = 'https://ajax.googleapis.com/'
search_url = url + 'ajax/services/search/web?v=1.0&start=0&rsz=large&safe=off&filter=off&{query}' # noqa search_url = url + 'ajax/services/search/web?v=1.0&start={offset}&rsz=large&safe=off&filter=off&{query}' # noqa
def request(query, params): def request(query, params):
params['url'] = search_url.format(query=urlencode({'q': query})) offset = (params['pageno'] - 1) * 8
params['url'] = search_url.format(offset=offset,
query=urlencode({'q': query}))
return params return params