diff options
| author | Markus Heiser <markus.heiser@darmarIT.de> | 2019-12-23 13:58:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-23 13:58:53 +0000 |
| commit | 07c8ca87e623a1b42d3bb4c22eb5145837c98b73 (patch) | |
| tree | c892a02295e27f2f43d1efd13e1c20fc51972b69 /searx | |
| parent | c8645d6e376ba5a072be370d12efdec298f4e3ad (diff) | |
| parent | 3e14bf4d2786ce5f2a61684cf16744700e670e60 (diff) | |
Merge branch 'master' into makefile-doc
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/engines/wikipedia.py | 6 | ||||
| -rw-r--r-- | searx/webapp.py | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/searx/engines/wikipedia.py b/searx/engines/wikipedia.py index 690da72fe..a216ba886 100644 --- a/searx/engines/wikipedia.py +++ b/searx/engines/wikipedia.py @@ -21,7 +21,8 @@ search_url = base_url + u'w/api.php?'\ 'action=query'\ '&format=json'\ '&{query}'\ - '&prop=extracts|pageimages'\ + '&prop=extracts|pageimages|pageprops'\ + '&ppprop=disambiguation'\ '&exintro'\ '&explaintext'\ '&pithumbsize=300'\ @@ -87,7 +88,7 @@ def response(resp): if int(article_id) > 0: break - if int(article_id) < 0: + if int(article_id) < 0 or 'disambiguation' in page.get('pageprops', {}): return [] title = page.get('title') @@ -99,6 +100,7 @@ def response(resp): extract = page.get('extract') summary = extract_first_paragraph(extract, title, image) + summary = summary.replace('() ', '') # link to wikipedia article wikipedia_link = base_url.format(language=url_lang(resp.search_params['language'])) \ diff --git a/searx/webapp.py b/searx/webapp.py index 7cf4106d3..212c874c9 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -606,11 +606,11 @@ def index(): # HTML output format # suggestions: use RawTextQuery to get the suggestion URLs with the same bang - suggestion_urls = map(lambda suggestion: { - 'url': raw_text_query.changeSearchQuery(suggestion).getFullQuery(), - 'title': suggestion - }, - result_container.suggestions) + suggestion_urls = list(map(lambda suggestion: { + 'url': raw_text_query.changeSearchQuery(suggestion).getFullQuery(), + 'title': suggestion + }, + result_container.suggestions)) correction_urls = list(map(lambda correction: { 'url': raw_text_query.changeSearchQuery(correction).getFullQuery(), |