diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2014-10-04 22:46:47 +0200 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2014-10-04 22:46:47 +0200 |
| commit | 67b69619ba8fbf17820f303093e883055531efff (patch) | |
| tree | 50ada9411ed2e2ad13125a542f0f7b24360e2e62 /searx/webapp.py | |
| parent | fce6fb2fa8f1b95d36b8043e0cea160b2f9fc633 (diff) | |
| parent | 63a0328c8b26c5d749ecf83ee73a44902e1d5cef (diff) | |
Merge pull request #104 from dalf/master
[enh] add infoboxes and answers, [fix] when two results are merged, really use the content with more text
Diffstat (limited to 'searx/webapp.py')
| -rw-r--r-- | searx/webapp.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/searx/webapp.py b/searx/webapp.py index f66466b35..74f8fad7e 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -199,7 +199,7 @@ def index(): 'index.html', ) - search.results, search.suggestions = search.search(request) + search.results, search.suggestions, search.answers, search.infoboxes = search.search(request) for result in search.results: @@ -292,6 +292,8 @@ def index(): pageno=search.pageno, base_url=get_base_url(), suggestions=search.suggestions, + answers=search.answers, + infoboxes=search.infoboxes, theme=get_current_theme_name() ) |