浏览代码

[mod] bing and duckduckgo engines : add / rename locale parameter

Dalf 11 年前
父节点
当前提交
bf56ec4fb1
共有 3 个文件被更改,包括 7 次插入5 次删除
  1. 2
    1
      engines.cfg_sample
  2. 2
    2
      searx/engines/bing.py
  3. 3
    2
      searx/engines/duckduckgo.py

+ 2
- 1
engines.cfg_sample 查看文件

5
 
5
 
6
 [bing]
6
 [bing]
7
 engine = bing
7
 engine = bing
8
-language = en-us
8
+locale = en-us
9
 
9
 
10
 [cc]
10
 [cc]
11
 engine=currency_convert
11
 engine=currency_convert
20
 
20
 
21
 [duckduckgo]
21
 [duckduckgo]
22
 engine = duckduckgo
22
 engine = duckduckgo
23
+locale = en-us
23
 
24
 
24
 [flickr]
25
 [flickr]
25
 engine = flickr
26
 engine = flickr

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

4
 
4
 
5
 base_url = 'http://www.bing.com/'
5
 base_url = 'http://www.bing.com/'
6
 search_string = 'search?{query}'
6
 search_string = 'search?{query}'
7
-language = 'en-us' # see http://msdn.microsoft.com/en-us/library/dd251064.aspx
7
+locale = 'en-US' # see http://msdn.microsoft.com/en-us/library/dd251064.aspx
8
 
8
 
9
 
9
 
10
 def request(query, params):
10
 def request(query, params):
11
-    search_path = search_string.format(query=urlencode({'q': query, 'setmkt': language}))
11
+    search_path = search_string.format(query=urlencode({'q': query, 'setmkt': locale}))
12
     #if params['category'] == 'images':
12
     #if params['category'] == 'images':
13
     #    params['url'] = base_url + 'images/' + search_path
13
     #    params['url'] = base_url + 'images/' + search_path
14
     params['url'] = base_url + search_path
14
     params['url'] = base_url + search_path

+ 3
- 2
searx/engines/duckduckgo.py 查看文件

3
 from searx.utils import html_to_text
3
 from searx.utils import html_to_text
4
 
4
 
5
 url = 'https://duckduckgo.com/'
5
 url = 'https://duckduckgo.com/'
6
-search_url = url + 'd.js?{query}&l=us-en&p=1&s=0'
6
+search_url = url + 'd.js?{query}&p=1&s=0'
7
+locale = 'us-en'
7
 
8
 
8
 def request(query, params):
9
 def request(query, params):
9
-    params['url'] = search_url.format(query=urlencode({'q': query}))
10
+    params['url'] = search_url.format(query=urlencode({'q': query, 'l': locale}))
10
     return params
11
     return params
11
 
12
 
12
 
13