浏览代码

Merge branch 'ixquick' of https://github.com/pw3t/searx into ixquick

Conflicts:
	searx/engines/startpage.py
pw3t 11 年前
父节点
当前提交
b82ba74a7d
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 0
    1
      searx/engines/startpage.py
  2. 7
    0
      searx/settings.yml

+ 0
- 1
searx/engines/startpage.py 查看文件

4
 base_url = None
4
 base_url = None
5
 search_url = None
5
 search_url = None
6
 
6
 
7
-
8
 def request(query, params):
7
 def request(query, params):
9
     global search_url
8
     global search_url
10
     query = urlencode({'q': query})[2:]
9
     query = urlencode({'q': query})[2:]

+ 7
- 0
searx/settings.yml 查看文件

68
 
68
 
69
   - name : startpage
69
   - name : startpage
70
     engine : startpage
70
     engine : startpage
71
+    base_url : 'https://startpage.com/'
72
+    search_url : 'https://startpage.com/do/search'
73
+
74
+  - name : ixquick
75
+    engine : startpage
76
+    base_url : 'https://www.ixquick.com/'
77
+    search_url : 'https://www.ixquick.com/do/search'
71
 
78
 
72
   - name : twitter
79
   - name : twitter
73
     engine : twitter
80
     engine : twitter