浏览代码

[enh] search language support upadtes

asciimoo 11 年前
父节点
当前提交
68a0832524
共有 2 个文件被更改,包括 13 次插入2 次删除
  1. 7
    2
      searx/engines/startpage.py
  2. 6
    0
      searx/engines/yahoo.py

+ 7
- 2
searx/engines/startpage.py 查看文件

6
 
6
 
7
 # TODO paging
7
 # TODO paging
8
 paging = False
8
 paging = False
9
+# TODO complete list of country mapping
10
+country_map = {'en_US': 'eng',
11
+               'en_UK': 'uk',
12
+               'nl_NL': 'ned'}
9
 
13
 
10
 
14
 
11
 def request(query, params):
15
 def request(query, params):
12
-    global search_url
13
     query = urlencode({'q': query})[2:]
16
     query = urlencode({'q': query})[2:]
14
     params['url'] = search_url
17
     params['url'] = search_url
15
     params['method'] = 'POST'
18
     params['method'] = 'POST'
16
     params['data'] = {'query': query,
19
     params['data'] = {'query': query,
17
                       'startat': (params['pageno'] - 1) * 10}  # offset
20
                       '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
18
     return params
24
     return params
19
 
25
 
20
 
26
 
21
 def response(resp):
27
 def response(resp):
22
-    global base_url
23
     results = []
28
     results = []
24
     dom = html.fromstring(resp.content)
29
     dom = html.fromstring(resp.content)
25
     # ads xpath //div[@id="results"]/div[@id="sponsored"]//div[@class="result"]
30
     # ads xpath //div[@id="results"]/div[@id="sponsored"]//div[@class="result"]

+ 6
- 0
searx/engines/yahoo.py 查看文件

17
 
17
 
18
 def request(query, params):
18
 def request(query, params):
19
     offset = (params['pageno'] - 1) * 10 + 1
19
     offset = (params['pageno'] - 1) * 10 + 1
20
+    if params['language'] == 'all':
21
+        language = 'en'
22
+    else:
23
+        language = params['language'].split('_')[0]
20
     params['url'] = search_url.format(offset=offset,
24
     params['url'] = search_url.format(offset=offset,
21
                                       query=urlencode({'p': query}))
25
                                       query=urlencode({'p': query}))
26
+    params['cookies']['sB'] = 'fl=1&vl=lang_{lang}&sh=1&rw=new&v=1'\
27
+            .format(lang=language)
22
     return params
28
     return params
23
 
29
 
24
 
30