diff options
| author | Alexandre Flament <alex@al-f.net> | 2017-01-27 13:47:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 13:47:59 +0000 |
| commit | e67dfaaac7991b299dd9c33ae69e7028cd8f6589 (patch) | |
| tree | 506ed1dd4a527e37c902035d84215ed2be2577d9 /searx/engines/xpath.py | |
| parent | 7a16aca346c14994f304a6961c55b63ab260265a (diff) | |
| parent | ee1d44caf9bb9b0fb1b3bafbcbff74486b5449e8 (diff) | |
Merge branch 'master' into flask_perimeter
Diffstat (limited to 'searx/engines/xpath.py')
| -rw-r--r-- | searx/engines/xpath.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/searx/engines/xpath.py b/searx/engines/xpath.py index 18943bba4..0d39b28a8 100644 --- a/searx/engines/xpath.py +++ b/searx/engines/xpath.py @@ -31,8 +31,6 @@ if xpath_results is a string element, then it's already done def extract_text(xpath_results): if type(xpath_results) == list: # it's list of result : concat everything using recursive call - if not xpath_results: - raise Exception('Empty url resultset') result = '' for e in xpath_results: result = result + extract_text(e) @@ -48,6 +46,8 @@ def extract_text(xpath_results): def extract_url(xpath_results, search_url): + if xpath_results == []: + raise Exception('Empty url resultset') url = extract_text(xpath_results) if url.startswith('//'): @@ -103,8 +103,8 @@ def response(resp): if results_xpath: for result in dom.xpath(results_xpath): url = extract_url(result.xpath(url_xpath), search_url) - title = extract_text(result.xpath(title_xpath)[0]) - content = extract_text(result.xpath(content_xpath)[0]) + title = extract_text(result.xpath(title_xpath)) + content = extract_text(result.xpath(content_xpath)) results.append({'url': url, 'title': title, 'content': content}) else: for url, title, content in zip( |