bf56ec4 · searx · git.iko.soy

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

commitbf56ec4fb1199ab46feeacb8a045d28b287baf47 authorDalf <alex@al-f.net> dateSun 5 Jan 2014, 13:58 (13 years ago) parent49c85fc

3 files changed+7−5

unifiedsplit

engines.cfg_sample+2−1

@@ -5,7 +5,7 @@ number_of_results = 1

66[bing]

77engine = bing

8−language = en-us

8+locale = en-us

1010[cc]

1111engine=currency_convert

@@ -20,6 +20,7 @@ engine = duckduckgo_definitions

2020

2121[duckduckgo]

2222engine = duckduckgo

23+locale = en-us

2324

2425[flickr]

2526engine = flickr

searx/engines/bing.py+2−2

@@ -4,11 +4,11 @@ from cgi import escape

55base_url = 'http://www.bing.com/'

66search_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

1010def 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}))

1212 #if params['category'] == 'images':

1313 # params['url'] = base_url + 'images/' + search_path

1414 params['url'] = base_url + search_path

searx/engines/duckduckgo.py+3−2

@@ -3,10 +3,11 @@ from urllib import urlencode

33from searx.utils import html_to_text

55url = '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'

89def 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}))

1011 return params

1112

1213