on master help sign in
[enh] search language support upadtes
commit68a08325241478df8374a8dd640d74648bdc4b72 authorasciimoo <asciimoo@gmail.com> dateFri 31 Jan 2014, 05:10 (13 years ago) parent2a788c8
2 files changed+13−2
searx/engines/startpage.py+7−2 searx/engines/yahoo.py+6
searx/engines/startpage.py+7−2
@@ -6,20 +6,25 @@ search_url = None
66
77# TODO paging
88paging = False
9+# TODO complete list of country mapping
10+country_map = {'en_US': 'eng',
11+ 'en_UK': 'uk',
12+ 'nl_NL': 'ned'}
913
1014
1115def request(query, params):
12− global search_url
1316 query = urlencode({'q': query})[2:]
1417 params['url'] = search_url
1518 params['method'] = 'POST'
1619 params['data'] = {'query': query,
1720 'startat': (params['pageno'] - 1) * 10} # offset
21+ country = country_map.get(params['language'], 'eng')
22+ params['cookies']['preferences'] = \
23+ 'lang_homepageEEEs/air/{country}/N1NsslEEE1N1Nfont_sizeEEEmediumN1Nrecent_results_filterEEE1N1Nlanguage_uiEEEenglishN1Ndisable_open_in_new_windowEEE0N1Ncolor_schemeEEEnewN1Nnum_of_resultsEEE10N1N'.format(country=country) # noqa
1824 return params
1925
2026
2127def response(resp):
22− global base_url
2328 results = []
2429 dom = html.fromstring(resp.content)
2530 # ads xpath //div[@id="results"]/div[@id="sponsored"]//div[@class="result"]
searx/engines/yahoo.py+6
@@ -17,8 +17,14 @@ paging = True
1717
1818def request(query, params):
1919 offset = (params['pageno'] - 1) * 10 + 1
20+ if params['language'] == 'all':
21+ language = 'en'
22+ else:
23+ language = params['language'].split('_')[0]
2024 params['url'] = search_url.format(offset=offset,
2125 query=urlencode({'p': query}))
26+ params['cookies']['sB'] = 'fl=1&vl=lang_{lang}&sh=1&rw=new&v=1'\
27+ .format(lang=language)
2228 return params
2329
2430