git.iko.soy/searx
on master help sign in
[fix] default_doi_resolver in preferences
ebfd0ebMarkus Heiser
searx/plugins/oa_doi_rewrite.py+2−2
compare with master
unifiedsplit
@@ -29,7 +29,7 @@ def get_doi_resolver(args, preference_doi_resolver):
29 doi_resolvers = settings['doi_resolvers']
29 doi_resolvers = settings['doi_resolvers']
30 doi_resolver = args.get('doi_resolver', preference_doi_resolver)[0]
30 doi_resolver = args.get('doi_resolver', preference_doi_resolver)[0]
31 if doi_resolver not in doi_resolvers:
31 if doi_resolver not in doi_resolvers:
32− doi_resolvers = settings['default_doi_resolver']
32+ doi_resolver = settings['default_doi_resolver']
33 doi_resolver_url = doi_resolvers[doi_resolver]
33 doi_resolver_url = doi_resolvers[doi_resolver]
34 return doi_resolver_url
34 return doi_resolver_url
35
35
@@ -40,7 +40,7 @@ def on_result(request, search, result):
40
40
41 doi = extract_doi(result['parsed_url'])
41 doi = extract_doi(result['parsed_url'])
42 if doi and len(doi) < 50:
42 if doi and len(doi) < 50:
43− for suffix in ('/', '.pdf', '/full', '/meta', '/abstract'):
43+ for suffix in ('/', '.pdf', '.xml', '/full', '/meta', '/abstract'):
44 if doi.endswith(suffix):
44 if doi.endswith(suffix):
45 doi = doi[:-len(suffix)]
45 doi = doi[:-len(suffix)]
46 result['url'] = get_doi_resolver(request.args, request.preferences.get_value('doi_resolver')) + doi
46 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:
387 }
387 }
388 ),
388 ),
389 'doi_resolver': MultipleChoiceSetting(
389 'doi_resolver': MultipleChoiceSetting(
390− ['oadoi.org'],
390+ [settings['default_doi_resolver'], ],
391 is_locked('doi_resolver'),
391 is_locked('doi_resolver'),
392 choices=DOI_RESOLVERS
392 choices=DOI_RESOLVERS
393 ),
393 ),
searx/settings.yml+1−1
@@ -1395,4 +1395,4 @@ doi_resolvers :
1395 doai.io : 'https://dissem.in/'
1395 doai.io : 'https://dissem.in/'
1396 sci-hub.tw : 'https://sci-hub.tw/'
1396 sci-hub.tw : 'https://sci-hub.tw/'
1397
1397
1398−default_doi_resolver : 'sci-hub.tw'
1398+default_doi_resolver : 'oadoi.org'
searx/templates/oscar/preferences.html+1−1
@@ -165,7 +165,7 @@
165 {{ preferences_item_header(info, label, rtl, 'doi_resolver') }}
165 {{ preferences_item_header(info, label, rtl, 'doi_resolver') }}
166 <select class="form-control {{ custom_select_class(rtl) }}" name="doi_resolver" id="doi_resolver">
166 <select class="form-control {{ custom_select_class(rtl) }}" name="doi_resolver" id="doi_resolver">
167 {% for doi_resolver_name,doi_resolver_url in doi_resolvers.items() %}
167 {% 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 %}>
169 {{ doi_resolver_name }} - {{ doi_resolver_url }}
169 {{ doi_resolver_name }} - {{ doi_resolver_url }}
170 </option>
170 </option>
171 {% endfor %}
171 {% endfor %}
searx/templates/simple/preferences.html+1−1
@@ -96,7 +96,7 @@
96 <p class="value">
96 <p class="value">
97 <select id='doi_resolver' name='doi_resolver'>
97 <select id='doi_resolver' name='doi_resolver'>
98 {%- for doi_resolver_name,doi_resolver_url in doi_resolvers.items() -%}
98 {%- 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 %}>
100 {{- doi_resolver_name }} - {{ doi_resolver_url -}}
100 {{- doi_resolver_name }} - {{ doi_resolver_url -}}
101 </option>
101 </option>
102 {%- endfor -%}
102 {%- endfor -%}