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') 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 73ec2ba74ec735bb5e989cab0336ecca24a93701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Bourrel?= Date: Wed, 19 Dec 2018 11:12:25 +0100 Subject: Update bing image engine with new image json format --- searx/engines/bing_images.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'searx') diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py index 66e14c01f..876011f1d 100644 --- a/searx/engines/bing_images.py +++ b/searx/engines/bing_images.py @@ -88,9 +88,7 @@ def response(resp): url = json_data.get('purl') img_src = json_data.get('murl') - - thumb_json_data = loads(_quote_keys_regex.sub(r'\1"\2": \3', link.attrib.get('mad'))) - thumbnail = thumb_json_data.get('turl') + thumbnail = json_data.get('turl') # append result results.append({'template': 'images.html', -- cgit v1.2.3