git.iko.soy/searx
on master help sign in
Merge branch 'master' of https://github.com/asciimoo/searx into makefile-doc
5eb8cf4Markus Heiser
README.rst+3−3
compare with master
unifiedsplit
@@ -23,13 +23,13 @@ Go to the `searx-docker <https://github.com/searx/searx-docker>`__ project.
23
23
24Without Docker
24Without Docker
25------
25------
26−For all the details, follow this `step by step installation <https://asciimoo.github.io/searx/dev/install/installation.html>`__.
26+For all of the details, follow this `step by step installation <https://asciimoo.github.io/searx/dev/install/installation.html>`__.
27
27
28Note: the documentation needs to be updated.
28Note: the documentation needs to be updated.
29
29
30−If you are in hurry
30+If you are in a hurry
31------
31------
32−- clone source:
32+- clone the source:
33 ``git clone https://github.com/asciimoo/searx.git && cd searx``
33 ``git clone https://github.com/asciimoo/searx.git && cd searx``
34- install dependencies: ``./manage.sh update_packages``
34- install dependencies: ``./manage.sh update_packages``
35- edit your
35- edit your
searx/settings.yml+5−5
@@ -408,7 +408,7 @@ engines:
408
408
409 - name : library genesis
409 - name : library genesis
410 engine : xpath
410 engine : xpath
411− search_url : http://libgen.io/search.php?req={query}
411+ search_url : https://libgen.is/search.php?req={query}
412 url_xpath : //a[contains(@href,"bookfi.net")]/@href
412 url_xpath : //a[contains(@href,"bookfi.net")]/@href
413 title_xpath : //a[contains(@href,"book/")]/text()[1]
413 title_xpath : //a[contains(@href,"book/")]/text()[1]
414 content_xpath : //td/a[1][contains(@href,"=author")]/text()
414 content_xpath : //td/a[1][contains(@href,"=author")]/text()
@@ -464,7 +464,7 @@ engines:
464 - name : openairedatasets
464 - name : openairedatasets
465 engine : json_engine
465 engine : json_engine
466 paging : True
466 paging : True
467− search_url : http://api.openaire.eu/search/datasets?format=json&page={pageno}&size=10&title={query}
467+ search_url : https://api.openaire.eu/search/datasets?format=json&page={pageno}&size=10&title={query}
468 results_query : response/results/result
468 results_query : response/results/result
469 url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
469 url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
470 title_query : metadata/oaf:entity/oaf:result/title/$
470 title_query : metadata/oaf:entity/oaf:result/title/$
@@ -476,7 +476,7 @@ engines:
476 - name : openairepublications
476 - name : openairepublications
477 engine : json_engine
477 engine : json_engine
478 paging : True
478 paging : True
479− search_url : http://api.openaire.eu/search/publications?format=json&page={pageno}&size=10&title={query}
479+ search_url : https://api.openaire.eu/search/publications?format=json&page={pageno}&size=10&title={query}
480 results_query : response/results/result
480 results_query : response/results/result
481 url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
481 url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
482 title_query : metadata/oaf:entity/oaf:result/title/$
482 title_query : metadata/oaf:entity/oaf:result/title/$
@@ -812,7 +812,7 @@ locales:
812doi_resolvers :
812doi_resolvers :
813 oadoi.org : 'https://oadoi.org/'
813 oadoi.org : 'https://oadoi.org/'
814 doi.org : 'https://doi.org/'
814 doi.org : 'https://doi.org/'
815− doai.io : 'http://doai.io/'
815+ doai.io : 'https://doai.io/'
816− sci-hub.tw : 'http://sci-hub.tw/'
816+ sci-hub.tw : 'https://sci-hub.tw/'
817
817
818default_doi_resolver : 'oadoi.org'
818default_doi_resolver : 'oadoi.org'
searx/settings_robot.yml+2−2
@@ -43,7 +43,7 @@ locales:
43doi_resolvers :
43doi_resolvers :
44 oadoi.org : 'https://oadoi.org/'
44 oadoi.org : 'https://oadoi.org/'
45 doi.org : 'https://doi.org/'
45 doi.org : 'https://doi.org/'
46− doai.io : 'http://doai.io/'
46+ doai.io : 'https://doai.io/'
47− sci-hub.tw : 'http://sci-hub.tw/'
47+ sci-hub.tw : 'https://sci-hub.tw/'
48
48
49default_doi_resolver : 'oadoi.org'
49default_doi_resolver : 'oadoi.org'
searx/static/plugins/js/vim_hotkeys.js+10−2
@@ -125,6 +125,14 @@ $(document).ready(function() {
125 }
125 }
126 });
126 });
127
127
128+ function nextResult(current, direction) {
129+ var next = current[direction]();
130+ while (!next.is('.result') && next.length !== 0) {
131+ next = next[direction]();
132+ }
133+ return next
134+ }
135+
128 function highlightResult(which) {
136 function highlightResult(which) {
129 return function() {
137 return function() {
130 var current = $('.result[data-vim-selected]');
138 var current = $('.result[data-vim-selected]');
@@ -157,13 +165,13 @@ $(document).ready(function() {
157 }
165 }
158 break;
166 break;
159 case 'down':
167 case 'down':
160− next = current.next('.result');
168+ next = nextResult(current, 'next');
161 if (next.length === 0) {
169 if (next.length === 0) {
162 next = $('.result:first');
170 next = $('.result:first');
163 }
171 }
164 break;
172 break;
165 case 'up':
173 case 'up':
166− next = current.prev('.result');
174+ next = nextResult(current, 'prev');
167 if (next.length === 0) {
175 if (next.length === 0) {
168 next = $('.result:last');
176 next = $('.result:last');
169 }
177 }