Browse Source

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

Dalf 11 years ago
parent
commit
bf56ec4fb1
3 changed files with 7 additions and 5 deletions
  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 View File

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

+ 2
- 2
searx/engines/bing.py View File

@@ -4,11 +4,11 @@ from cgi import escape
4 4
 
5 5
 base_url = 'http://www.bing.com/'
6 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 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 12
     #if params['category'] == 'images':
13 13
     #    params['url'] = base_url + 'images/' + search_path
14 14
     params['url'] = base_url + search_path

+ 3
- 2
searx/engines/duckduckgo.py View File

@@ -3,10 +3,11 @@ from urllib import urlencode
3 3
 from searx.utils import html_to_text
4 4
 
5 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 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 11
     return params
11 12
 
12 13