diff options
| author | Mathieu Brunot <mathieu.brunot@monogramm.io> | 2019-12-24 21:38:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-24 21:38:07 +0100 |
| commit | 359c18f9e633fe4cf1062bb2e7507840065e6ca5 (patch) | |
| tree | a0babfcc9471b69a20358fa95f47e22b469af7f0 /searx/engines/wikipedia.py | |
| parent | 088752959e5cb635b55cb74e8d9d90e5062e0a7f (diff) | |
| parent | a52a638ba88466c587fd8afa744434711b1e4822 (diff) | |
Merge branch 'master' into docker/opencontainers
Diffstat (limited to 'searx/engines/wikipedia.py')
| -rw-r--r-- | searx/engines/wikipedia.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/searx/engines/wikipedia.py b/searx/engines/wikipedia.py index 4dae735d1..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'\ @@ -79,12 +80,15 @@ def response(resp): # wikipedia article's unique id # first valid id is assumed to be the requested article + if 'pages' not in search_result['query']: + return results + for article_id in search_result['query']['pages']: page = search_result['query']['pages'][article_id] 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') @@ -96,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'])) \ |