summaryrefslogtreecommitdiff
path: root/searx/webapp.py
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2017-11-01 21:27:57 +0100
committerGitHub <noreply@github.com>2017-11-01 21:27:57 +0100
commit3d50b0288dc2ba42baf550353f3fb5bee6462754 (patch)
tree3931e34b8501cd58db58cb651b0193ee46c23eb8 /searx/webapp.py
parent6d28e9d6945b5510b3d861e20521554435a10f63 (diff)
parent5954a8e16a64a369072a7487f62b6396a451ae5f (diff)
Merge pull request #1075 from kvch/finish-jibe-b-engines
Finish PRs of @jibe-b: pubmed, oa_doi_rewrite, openaire, arxiv
Diffstat (limited to 'searx/webapp.py')
-rw-r--r--searx/webapp.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/searx/webapp.py b/searx/webapp.py
index dd93395ee..f81747325 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -66,6 +66,7 @@ from searx.search import SearchWithPlugins, get_search_query_from_webapp
from searx.query import RawTextQuery
from searx.autocomplete import searx_bang, backends as autocomplete_backends
from searx.plugins import plugins
+from searx.plugins.oa_doi_rewrite import get_doi_resolver
from searx.preferences import Preferences, ValidationException
from searx.answerers import answerers
from searx.url_utils import urlencode, urlparse, urljoin
@@ -695,6 +696,8 @@ def preferences():
shortcuts={y: x for x, y in engine_shortcuts.items()},
themes=themes,
plugins=plugins,
+ doi_resolvers=settings['doi_resolvers'],
+ current_doi_resolver=get_doi_resolver(request.args, request.preferences.get_value('doi_resolver')),
allowed_plugins=allowed_plugins,
theme=get_current_theme_name(),
preferences_url_params=request.preferences.get_as_url_params(),
@@ -839,7 +842,10 @@ def config():
'autocomplete': settings['search']['autocomplete'],
'safe_search': settings['search']['safe_search'],
'default_theme': settings['ui']['default_theme'],
- 'version': VERSION_STRING})
+ 'version': VERSION_STRING,
+ 'doi_resolvers': [r for r in search['doi_resolvers']],
+ 'default_doi_resolver': settings['default_doi_resolver'],
+ })
@app.errorhandler(404)