diff options
| author | Noémi Ványi <kvch@users.noreply.github.com> | 2019-01-04 22:14:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 22:14:40 +0100 |
| commit | aeb6dab1872921fc129d47830620ae78bc185e53 (patch) | |
| tree | 48097abd82e8e41f1022c16fc5aa46f5ee78914d /searx | |
| parent | 0d86ed9c7e274c69bcee4bca838e19ec4f632699 (diff) | |
| parent | 82bf9c6b290423b5b7b300fc3af68bbfa32f3d4f (diff) | |
| download | searxng-aeb6dab1872921fc129d47830620ae78bc185e53.tar.gz searxng-aeb6dab1872921fc129d47830620ae78bc185e53.zip | |
Merge branch 'master' into master
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/engines/bing_images.py | 4 | ||||
| -rw-r--r-- | searx/engines/startpage.py | 7 |
2 files changed, 5 insertions, 6 deletions
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', diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py index a52d9128d..55efdc884 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 @@ -75,8 +76,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 = '' |