@@ -8,9 +8,11 @@
88# @stable no
99# @parse url, infobox
1010
11+from cgi import escape
1112from json import loads
1213from time import time
1314from urllib import urlencode
15+from lxml.etree import XML
1416
1517from searx.poolrequests import get as http_get
1618
@@ -34,7 +36,7 @@ search_url = url + 'input/json.jsp'\
3436referer_url = url + 'input/?{query}'
3537
3638token = {'value': '',
37− 'last_updated': 0}
39+ 'last_updated': None}
3840
3941# pods to display as image in infobox
4042# this pods do return a plaintext, but they look better and are more useful as images
@@ -80,8 +82,8 @@ def response(resp):
8082
8183 # TODO handle resp_json['queryresult']['assumptions']
8284 result_chunks = []
83− infobox_title = None
84− result = ""
85+ infobox_title = ""
86+ result_content = ""
8587 for pod in resp_json['queryresult']['pods']:
8688 pod_id = pod.get('id', '')
8789 pod_title = pod.get('title', '')
@@ -99,8 +101,9 @@ def response(resp):
99101 if subpod['plaintext'] != '(requires interactivity)':
100102 result_chunks.append({'label': pod_title, 'value': subpod['plaintext']})
101103
102− if pod_is_result:
103− result = subpod['plaintext']
104+ if pod_is_result or not result_content:
105+ if pod_id != "Input":
106+ result_content = pod_title + ': ' + subpod['plaintext']
104107
105108 elif 'img' in subpod:
106109 result_chunks.append({'label': pod_title, 'image': subpod['img']})
@@ -113,7 +116,7 @@ def response(resp):
113116 'urls': [{'title': 'Wolfram|Alpha', 'url': resp.request.headers['Referer'].decode('utf8')}]})
114117
115118 results.append({'url': resp.request.headers['Referer'].decode('utf8'),
116− 'title': infobox_title + ' - Wolfram|Alpha',
117− 'content': result})
119+ 'title': 'Wolfram|Alpha (' + infobox_title + ')',
120+ 'content': result_content})
118121
119122 return results