[fix] yahoo url extraction

This commit is contained in:
Adam Tauber 2014-03-08 19:09:03 +01:00
parent aa9df5bf16
commit 0fc481f47e
2 changed files with 7 additions and 9 deletions

View file

@ -1,9 +1,9 @@
#!/usr/bin/env python
from urllib import urlencode
from urlparse import unquote
from lxml import html
from searx.engines.xpath import extract_text, extract_url
from searx.engines.yahoo import parse_url
categories = ['news']
search_url = 'http://news.search.yahoo.com/search?{query}&b={offset}'
@ -34,10 +34,7 @@ def response(resp):
dom = html.fromstring(resp.text)
for result in dom.xpath(results_xpath):
url_string = extract_url(result.xpath(url_xpath), search_url)
start = url_string.find('http', url_string.find('/RU=')+1)
end = url_string.rfind('/RS')
url = unquote(url_string[start:end])
url = parse_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])
results.append({'url': url, 'title': title, 'content': content})