searx

commit: acfe843ecd038ee3518f2afcee68bfedf4366366
parent: 104cdb7d03771d4eca5b5126532ccf47642bb9de
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Tue, 16 Aug 2016 10:36:05 +0200

Merge pull request #663 from davidar/hoogle

Add Hoogle search engine
Diffstat:
M
searx/engines/json_engine.py
2
+-
M
searx/engines/xpath.py
2
+-
M
searx/results.py
2
+-
M
searx/settings.yml
12
++++++++++++

4 files changed, 15 insertions(+), 3 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
diff --git a/searx/results.py b/searx/results.py
@@ -28,7 +28,7 @@ def compare_urls(url_a, url_b):
     else:
         host_b = url_b.netloc
 
-    if host_a != host_b or url_a.query != url_b.query:
+    if host_a != host_b or url_a.query != url_b.query or url_a.fragment != url_b.fragment:
         return False
 
     # remove / from the end of the url if required
diff --git a/searx/settings.yml b/searx/settings.yml
@@ -281,6 +281,18 @@ engines:
     disabled : True
     shortcut : habr
 
+  - name : hoogle
+    engine : json_engine
+    paging : True
+    search_url : https://www.haskell.org/hoogle/?mode=json&hoogle={query}&start={pageno}
+    results_query : results
+    url_query : location
+    title_query : self
+    content_query : docs
+    page_size : 20
+    categories : it
+    shortcut : ho
+
   - name : ina
     engine : ina
     shortcut : in