From 0d86ed9c7e274c69bcee4bca838e19ec4f632699 Mon Sep 17 00:00:00 2001 From: dimqua Date: Tue, 11 Dec 2018 21:45:47 +0300 Subject: update startpage.py --- searx/engines/startpage.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'searx/engines/startpage.py') diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py index 3e067597e..a52d9128d 100644 --- a/searx/engines/startpage.py +++ b/searx/engines/startpage.py @@ -73,10 +73,6 @@ def response(resp): if re.match(r"^http(s|)://(www\.)?startpage\.com/do/search\?.*$", url): continue - # block ixquick search url's - if re.match(r"^http(s|)://(www\.)?ixquick\.com/do/search\?.*$", url): - continue - title = extract_text(link) if result.xpath('./p[@class="desc clk"]'): -- cgit v1.2.3 From 44ce51f0c53139b109f7d00662780fa5def99df8 Mon Sep 17 00:00:00 2001 From: Michael Pfitzner Date: Fri, 14 Dec 2018 21:08:04 +0100 Subject: restore startpage search results --- searx/engines/startpage.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'searx/engines/startpage.py') diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py index 3e067597e..166c11f83 100644 --- a/searx/engines/startpage.py +++ b/searx/engines/startpage.py @@ -32,8 +32,9 @@ search_url = base_url + 'do/search' # specific xpath variables # ads xpath //div[@id="results"]/div[@id="sponsored"]//div[@class="result"] # not ads: div[@class="result"] are the direct childs of div[@id="results"] -results_xpath = '//div[@class="result"]' +results_xpath = '//li[contains(@class, "search-result") and contains(@class, "search-item")]' link_xpath = './/h3/a' +content_xpath = './p[@class="search-item__body"]' # do search-request @@ -79,8 +80,8 @@ def response(resp): title = extract_text(link) - if result.xpath('./p[@class="desc clk"]'): - content = extract_text(result.xpath('./p[@class="desc clk"]')) + if result.xpath(content_xpath): + content = extract_text(result.xpath(content_xpath)) else: content = '' -- cgit v1.2.3 From b63d645a52d663036b97e31a59818d79faa4da81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Sun, 6 Jan 2019 15:27:46 +0100 Subject: Revert "remove 'all' option from search languages" This reverts commit 4d1770398a6af8902e75c0bd885781584d39e796. --- searx/engines/startpage.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'searx/engines/startpage.py') diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py index 55efdc884..6638f3d83 100644 --- a/searx/engines/startpage.py +++ b/searx/engines/startpage.py @@ -46,8 +46,9 @@ def request(query, params): params['data'] = {'query': query, 'startat': offset} - # set language - params['data']['with_language'] = ('lang_' + params['language'].split('-')[0]) + # set language if specified + if params['language'] != 'all': + params['data']['with_language'] = ('lang_' + params['language'].split('-')[0]) return params -- cgit v1.2.3