@@ -16,31 +16,30 @@ from searx.utils import html_to_text
1616# search-url
1717base_url = 'http://api.wolframalpha.com/v2/query'
1818search_url = base_url + '?appid={api_key}&{query}&format=plaintext'
19−site_url = 'http://wolframalpha.com/input/?{query}'
19+api_key = ''
20+
2021
2122# do search-request
2223def request(query, params):
2324 params['url'] = search_url.format(query=urlencode({'input': query}),
2425 api_key=api_key)
2526
26− # need this for url in response
27− global my_query
28− my_query = query
29−
3027 return params
3128
29+
3230# replace private user area characters to make text legible
3331def replace_pua_chars(text):
34− pua_chars = { u'\uf74c': 'd',
35− u'\uf74d': u'\u212f',
36− u'\uf74e': 'i',
37− u'\uf7d9': '=' }
32+ pua_chars = {u'\uf74c': 'd',
33+ u'\uf74d': u'\u212f',
34+ u'\uf74e': 'i',
35+ u'\uf7d9': '='}
3836
3937 for k, v in pua_chars.iteritems():
4038 text = text.replace(k, v)
4139
4240 return text
4341
42+
4443# get response from search-request
4544def response(resp):
4645 results = []
@@ -55,13 +54,9 @@ def response(resp):
5554 result = search_results.xpath('//pod[attribute::primary="true"]/subpod/plaintext')[0].text
5655 result = replace_pua_chars(result)
5756
58− # bind url from site
59− result_url = site_url.format(query=urlencode({'i': my_query}))
60−
6157 # append result
6258 # TODO: shouldn't it bind the source too?
63− results.append({'url': result_url,
64− 'answer': result})
59+ results.append({'answer': result})
6560
6661 # return results
6762 return results