searx

commit: 1e9dab08e6102383840777e61732fa8e2df78d7c
parent 413e143707f9b573d8740cae92152e54df8fdfcd
Author: David A Roberts <d@vidr.cc>
Date:   Sun, 14 Aug 2016 21:46:54 +1000

[fix] behaviour for page_size>1 and first_page_num>0

eg. pageno=1,21,41,... instead of 20,40,60,...

Diffstat:
M
searx/engines/json_engine.py
2
+-
M
searx/engines/xpath.py
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/searx/engines/json_engine.py b/searx/engines/json_engine.py
@@ -81,7 +81,7 @@ def request(query, params):
 
     fp = {'query': query}
     if paging and search_url.find('{pageno}') >= 0:
-        fp['pageno'] = (params['pageno'] + first_page_num - 1) * page_size
+        fp['pageno'] = (params['pageno'] - 1) * page_size + first_page_num
 
     params['url'] = search_url.format(**fp)
     params['query'] = query
diff --git a/searx/engines/xpath.py b/searx/engines/xpath.py
@@ -87,7 +87,7 @@ def request(query, params):
 
     fp = {'query': query}
     if paging and search_url.find('{pageno}') >= 0:
-        fp['pageno'] = (params['pageno'] + first_page_num - 1) * page_size
+        fp['pageno'] = (params['pageno'] - 1) * page_size + first_page_num
 
     params['url'] = search_url.format(**fp)
     params['query'] = query