diff options
| author | pw3t <romain@berthor.fr> | 2014-01-23 22:17:19 +0100 |
|---|---|---|
| committer | pw3t <romain@berthor.fr> | 2014-01-23 22:17:19 +0100 |
| commit | b82ba74a7dfba4b3b3d54ecfc6f99e02d473f7d1 (patch) | |
| tree | 45ba9fb8634d7a079fb1199f406b08306106afcb | |
| parent | a01042ae616524160f32bfbca0e833b1de6dab58 (diff) | |
| parent | 1dd35e9916dabd5426f92e5e0921148b439bb376 (diff) | |
Merge branch 'ixquick' of https://github.com/pw3t/searx into ixquick
Conflicts:
searx/engines/startpage.py
| -rw-r--r-- | searx/engines/startpage.py | 1 | ||||
| -rw-r--r-- | searx/settings.yml | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py index 756e1670f..5a6c570d1 100644 --- a/searx/engines/startpage.py +++ b/searx/engines/startpage.py @@ -4,7 +4,6 @@ from lxml import html base_url = None search_url = None - def request(query, params): global search_url query = urlencode({'q': query})[2:] diff --git a/searx/settings.yml b/searx/settings.yml index c207f3f57..4978e9b6a 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -68,6 +68,13 @@ engines: - name : 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 engine : twitter |