[enh] wolframalpha appends result

This commit is contained in:
a01200356 2016-01-01 22:02:10 -06:00
parent be54e5269a
commit 0871c7ca85
3 changed files with 43 additions and 18 deletions

View file

@ -1,6 +1,7 @@
# WolframAlpha (Maths)
#
# @website http://www.wolframalpha.com/
# @provide-api yes (http://api.wolframalpha.com/v2/)
#
# @using-api no
# @results HTML
@ -14,12 +15,17 @@ from urllib import urlencode
# search-url
url = 'http://www.wolframalpha.com/'
search_url = url+'input/?{query}'
search_query = ''
# do search-request
def request(query, params):
params['url'] = search_url.format(query=urlencode({'i': query}))
# used in response
global search_query
search_query = query
return params
@ -42,14 +48,20 @@ def response(resp):
except AttributeError:
continue
if not line:
if line:
# extract answer from json
answer = line[line.find('{'):line.rfind('}')+1]
answer = loads(answer.encode('unicode-escape'))
answer = answer['stringified'].decode('unicode-escape')
results.append({'answer': answer})
# failed result
elif search('pfail', webpage):
return results
# extract answer from json
answer = line[line.find('{'):line.rfind('}')+1]
answer = loads(answer.encode('unicode-escape'))
answer = answer['stringified'].decode('unicode-escape')
results.append({'answer': answer})
# append result
results.append({'url': request(search_query, {})['url'],
'title': search_query + ' - Wolfram|Alpha'})
return results