Icycoide/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng.git synced 2025-07-30 00:22:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

minor fixes of doi resolver

Browse source 
Closes #1047
This commit is contained in:
Noémi Ványi 2017-11-01 13:58:48 +01:00
parent 575159b194
commit 1b10abfc92
4 changed files with 19 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

11
searx/webapp.py
View file

@ -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
@ -164,14 +165,6 @@ def get_locale():
return locale
def get_doi_resolver():
doi_resolvers = settings['doi_resolvers']
doi_resolver = request.args.get('doi_resolver', request.preferences.get_value('doi_resolver'))[0]
if doi_resolver not in doi_resolvers:
doi_resolvers = settings['default_doi_resolver']
return doi_resolver
# code-highlighter
@app.template_filter('code_highlighter')
def code_highlighter(codelines, language=None):
@ -704,7 +697,7 @@ def preferences():
themes=themes,
plugins=plugins,
doi_resolvers=settings['doi_resolvers'],
current_doi_resolver=get_doi_resolver(),
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(),