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

Browse Source 
Conflicts:
	searx/engines/startpage.py
This commit is contained in:
pw3t 2014-01-23 22:17:19 +01:00
commit b82ba74a7d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
searx/engines/startpage.py
View File

@ -4,7 +4,6 @@ from lxml import html
base_url = None base_url = None
search_url = None search_url = None
def request(query, params): def request(query, params):
global search_url global search_url
query = urlencode({'q': query})[2:] query = urlencode({'q': query})[2:]

7
searx/settings.yml
View File

@ -68,6 +68,13 @@ engines:
- name : startpage - name : startpage
engine : startpage engine : startpage
base_url : 'https://startpage.com/'
search_url : 'https://startpage.com/do/search'
- name : ixquick
engine : startpage
base_url : 'https://www.ixquick.com/'
search_url : 'https://www.ixquick.com/do/search'
- name : twitter - name : twitter
engine : twitter engine : twitter