ebfd0eb · searx · git.iko.soy

git.iko.soy/searx

[fix] default_doi_resolver in preferences

Instead of a hard-coded `oadoi.org` default, use the default value from `settings.yml`. Fix an issue in the themes: The replacement 'current_doi_resolver' contains the doi_resolver_url, not the name of the DOI resolver. Compare return value of:: searx.plugins.oa_doi_rewrite.get_doi_resolver(...) Fix a typo in `get_doi_resolver(..)`: suggested by @kvch: *L32 should set doi_resolver not doi_resolvers* Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commitebfd0eb2b79f73eef108ac1ad89c07174ad6441c authorMarkus Heiser <markus@darmarit.de> dateSun 4 Apr 2021, 13:36 (6 years ago) parent76a5305

5 files changed+6−6

compare with master

unifiedsplit

searx/plugins/oa_doi_rewrite.py+2−2 searx/preferences.py+1−1 searx/settings.yml+1−1 searx/templates/oscar/preferences.html+1−1 searx/templates/simple/preferences.html+1−1

searx/plugins/oa_doi_rewrite.py+2−2

@@ -29,7 +29,7 @@ def get_doi_resolver(args, preference_doi_resolver):

2929 doi_resolvers = settings['doi_resolvers']

3030 doi_resolver = args.get('doi_resolver', preference_doi_resolver)[0]

3131 if doi_resolver not in doi_resolvers:

32− doi_resolvers = settings['default_doi_resolver']

32+ doi_resolver = settings['default_doi_resolver']

3333 doi_resolver_url = doi_resolvers[doi_resolver]

3434 return doi_resolver_url

3535

@@ -40,7 +40,7 @@ def on_result(request, search, result):

4040

4141 doi = extract_doi(result['parsed_url'])

4242 if doi and len(doi) < 50:

43− for suffix in ('/', '.pdf', '/full', '/meta', '/abstract'):

43+ for suffix in ('/', '.pdf', '.xml', '/full', '/meta', '/abstract'):

4444 if doi.endswith(suffix):

4545 doi = doi[:-len(suffix)]

4646 result['url'] = get_doi_resolver(request.args, request.preferences.get_value('doi_resolver')) + doi

searx/preferences.py+1−1

@@ -387,7 +387,7 @@ class Preferences:

387387 }

388388 ),

389389 'doi_resolver': MultipleChoiceSetting(

390− ['oadoi.org'],

390+ [settings['default_doi_resolver'], ],

391391 is_locked('doi_resolver'),

392392 choices=DOI_RESOLVERS

393393 ),

searx/settings.yml+1−1

@@ -1395,4 +1395,4 @@ doi_resolvers :

13951395 doai.io : 'https://dissem.in/'

13961396 sci-hub.tw : 'https://sci-hub.tw/'

13971397

1398−default_doi_resolver : 'sci-hub.tw'

1398+default_doi_resolver : 'oadoi.org'

searx/templates/oscar/preferences.html+1−1

@@ -165,7 +165,7 @@

165165 {{ preferences_item_header(info, label, rtl, 'doi_resolver') }}

166166 <select class="form-control {{ custom_select_class(rtl) }}" name="doi_resolver" id="doi_resolver">

167167 {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %}

168− <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}>

168+ <option value="{{ doi_resolver_name }}" {% if doi_resolver_url == current_doi_resolver %}selected="selected"{% endif %}>

169169 {{ doi_resolver_name }} - {{ doi_resolver_url }}

170170 </option>

171171 {% endfor %}

searx/templates/simple/preferences.html+1−1

@@ -96,7 +96,7 @@

9696 <p class="value">

9797 <select id='doi_resolver' name='doi_resolver'>

9898 {%- for doi_resolver_name,doi_resolver_url in doi_resolvers.items() -%}

99− <option value="{{ doi_resolver_name }}" {% if doi_resolver_name == current_doi_resolver %}selected="selected"{% endif %}>

99+ <option value="{{ doi_resolver_name }}" {% if doi_resolver_url == current_doi_resolver %}selected="selected"{% endif %}>

100100 {{- doi_resolver_name }} - {{ doi_resolver_url -}}

101101 </option>

102102 {%- endfor -%}