From b3fde19ed59c6e05b1f076ea1f8a7cec21229083 Mon Sep 17 00:00:00 2001 From: a01200356 Date: Sun, 27 Dec 2015 21:09:45 -0600 Subject: [PATCH] Remove non API version (doesn't work) --- searx/engines/wolframalpha.py | 60 ------------------------------- searx/engines/wolframalpha_api.py | 2 +- 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 searx/engines/wolframalpha.py diff --git a/searx/engines/wolframalpha.py b/searx/engines/wolframalpha.py deleted file mode 100644 index be467681..00000000 --- a/searx/engines/wolframalpha.py +++ /dev/null @@ -1,60 +0,0 @@ -""" - WolframAlpha - - @website http://www.wolframalpha.com/ - - @using-api yes - @results no c - @stable i guess so - @parse result -""" - -import wolframalpha - -# engine dependent config -paging = False - -# search-url -# url = 'http://www.wolframalpha.com/' -# search_url = url+'input/?{query}' - -client_id = '5952JX-X52L3VKWT8' -''' -# do search-request -def request(query, params): - params['url'] = search_url.format(query=urlencode({'i': query})) - print params - - return params - - -# get response from search-request -def response(resp): - print resp - - dom = html.fromstring(resp.text) - #resshit = dom.find_class('output pnt') - #for shit in resshit: - #print shit.text_content() - results = [] - #results.append({'url': 'https://wikipedia.org', 'title': 'Wolfie, lol', 'content': 'es kwatro'}) - #print results - #return results - - # parse results - for result in dom.xpath(results_xpath): - print result - - link = result.xpath(link_xpath)[0] - href = urljoin(url, link.attrib.get('href')) - title = escape(extract_text(link)) - content = escape(extract_text(result.xpath(content_xpath))) - - # append result - results.append({'url': href, - 'title': title, - 'content': content}) - - print results - return results -''' diff --git a/searx/engines/wolframalpha_api.py b/searx/engines/wolframalpha_api.py index 8390e91f..b9da87c8 100644 --- a/searx/engines/wolframalpha_api.py +++ b/searx/engines/wolframalpha_api.py @@ -23,7 +23,7 @@ def request(query, params): params['url'] = search_url.format(query=urlencode({'input': query}), api_key=api_key) - need this for url in response + # need this for url in response global my_query my_query = query