@@ -10,8 +10,6 @@
1010import re
1111import json
1212from urllib import urlencode
13−from lxml import html
14−from searx.engines.xpath import extract_text
1513
1614# search-url
1715url = 'http://www.wolframalpha.com/'
@@ -25,42 +23,31 @@ def request(query, params):
2523 return params
2624
2725
28−# tries to find answer under the pattern given
29−def extract_answer(script_list, pattern):
30− answer = None
26+# get response from search-request
27+def response(resp):
28+ results = []
29+
30+ # the answer is inside a js function
31+ # answer can be located in different 'pods', although by default it should be in pod_0200
32+ possible_locations = ['pod_0200\.push(.*)\n',
33+ 'pod_0100\.push(.*)\n']
3134
3235 # get line that matches the pattern
33− for script in script_list:
36+ for pattern in possible_locations:
3437 try:
35− line = re.search(pattern, script.text_content()).group(1)
38+ line = re.search(pattern, resp.text).group(1)
39+ break
3640 except AttributeError:
3741 continue
3842
39− # extract answer from json
40− answer = line[line.find('{') : line.rfind('}')+1]
41− answer = json.loads(answer.encode('unicode-escape'))
42− answer = answer['stringified'].decode('unicode-escape')
43−
44− return answer
45−
43+ if not line:
44+ return results
4645
47−# get response from search-request
48−def response(resp):
49−
50− dom = html.fromstring(resp.text)
51−
52− # the answer is inside a js script
53− scripts = dom.xpath('//script')
46+ # extract answer from json
47+ answer = line[line.find('{') : line.rfind('}')+1]
48+ answer = json.loads(answer.encode('unicode-escape'))
49+ answer = answer['stringified'].decode('unicode-escape')
5450
55− results = []
56−
57− # answer can be located in different 'pods', although by default it should be in pod_0200
58− answer = extract_answer(scripts, 'pod_0200\.push(.*)\n')
59− if not answer:
60− answer = extract_answer(scripts, 'pod_0100\.push(.*)\n')
61− if answer:
62− results.append({'answer': answer})
63− else:
64− results.append({'answer': answer})
51+ results.append({'answer': answer})
6552
6653 return results