@@ -1,11 +1,25 @@
1+"""
2+DuckDuckGo (definitions)
3+
4+- `Instant Answer API`_
5+- `DuckDuckGo query`_
6+
7+.. _Instant Answer API: https://duckduckgo.com/api
8+.. _DuckDuckGo query: https://api.duckduckgo.com/?q=DuckDuckGo&format=json&pretty=1
9+
10+"""
11+
112import json
213from lxml import html
314from re import compile
15+import logging
416from searx.engines.xpath import extract_text
517from searx.engines.duckduckgo import _fetch_supported_languages, supported_languages_url, language_aliases
618from searx.url_utils import urlencode
719from searx.utils import html_to_text, match_language
820
21+logger = logging.getLogger('searx.engines.'+ __name__)
22+
923url = 'https://api.duckduckgo.com/'\
1024 + '?{query}&format=json&pretty=0&no_redirect=1&d=1'
1125
@@ -25,7 +39,9 @@ def result_to_text(url, text, htmlResult):
2539def request(query, params):
2640 params['url'] = url.format(query=urlencode({'q': query}))
2741 language = match_language(params['language'], supported_languages, language_aliases)
28− params['headers']['Accept-Language'] = language.split('-')[0]
42+ language = language.split('-')[0]
43+ params['headers']['Accept-Language'] = language
44+ logger.debug("query %s: // headers: %s", params['url'], params['headers'])
2945 return params
3046
3147
@@ -43,8 +59,9 @@ def response(resp):
4359
4460 # add answer if there is one
4561 answer = search_res.get('Answer', '')
46− if answer != '':
47− results.append({'answer': html_to_text(answer)})
62+ if answer:
63+ if search_res.get('AnswerType', '') not in ['calc']:
64+ results.append({'answer': html_to_text(answer)})
4865
4966 # add infobox
5067 if 'Definition' in search_res: