@@ -7,7 +7,12 @@ from urllib.parse import urlencode, urlparse
7from lxml import html
7from lxml import html
8from searx.poolrequests import get
8from searx.poolrequests import get
9from searx.exceptions import SearxEngineAccessDeniedException
9from searx.exceptions import SearxEngineAccessDeniedException
10−from searx.utils import extract_text, eval_xpath_list, eval_xpath_getindex
10+from searx.utils import (
@@ -26,7 +31,10 @@ def request(query, params):
26 response_index = get(base_url, headers=params['headers'], raise_for_httperror=True)
31 response_index = get(base_url, headers=params['headers'], raise_for_httperror=True)
27 dom = html.fromstring(response_index.text)
32 dom = html.fromstring(response_index.text)
29− url_params = {'q': query}
34+ url_params = {
30 for e in eval_xpath_list(dom, '//input[@type="hidden"]'):
38 for e in eval_xpath_list(dom, '//input[@type="hidden"]'):
31 name = e.get('name')
39 name = e.get('name')
32 value = e.get('value')
40 value = e.get('value')
@@ -45,20 +53,15 @@ def response(resp):
45 results = []
53 results = []
47 dom = html.fromstring(resp.content.decode())
55 dom = html.fromstring(resp.content.decode())
48− for result_element in eval_xpath_list(dom, '//div[@id="searchpage-root"]//div[@data-dot="results"]/div'):
56+ for result_element in eval_xpath_list(dom, '//div[@data-dot="results"]/div'):
49− dot_data = eval_xpath_getindex(result_element, './div/div[@data-dot-data]/@data-dot-data', 0, default=None)
57+ result_data = eval_xpath_getindex(result_element, './/div[contains(@class, "Result")]', 0, default=None)
50− if dot_data is None:
58+ if result_data is None:
51− title_element = eval_xpath_getindex(result_element, './/h3/a', 0)
60+ title_element = eval_xpath_getindex(result_element, './/h3/a', 0)
52− results.append({
61+ results.append({
53− 'url': title_element.get('href'),
62+ 'url': title_element.get('href'),
54− 'title': extract_text(title_element),
63+ 'title': extract_text(title_element),
55− 'content': extract_text(eval_xpath_getindex(title_element, '../../div[2]', 0)),
64+ 'content': extract_text(eval_xpath(result_data, './/p[@class="Result-description"]')),
57− elif dot_data == '{"reporter_name":"hint/related/relates"}':
58− suggestions_element = eval_xpath_getindex(result_element,
59− './div/div[@data-dot="main-box"]', 0, default=None)
60− if suggestions_element is not None:
61− for suggestion in eval_xpath_list(suggestions_element, './/ul/li'):
62− results.append({'suggestion': extract_text(suggestion)})
64 return results
67 return results