[fix] time range detection
This commit is contained in:
@@ -13,7 +13,6 @@
|
||||
"""
|
||||
|
||||
from urllib import urlencode
|
||||
from urlparse import urljoin
|
||||
from lxml import html
|
||||
import re
|
||||
from searx.engines.xpath import extract_text
|
||||
@@ -39,7 +38,7 @@ def request(query, params):
|
||||
|
||||
params['url'] = search_url.format(offset=offset,
|
||||
query=urlencode({'q': query}))
|
||||
if params['time_range']:
|
||||
if params['time_range'] in time_range_dict:
|
||||
params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
|
||||
|
||||
return params
|
||||
|
||||
@@ -67,7 +67,7 @@ def request(query, params):
|
||||
params['url'] = url.format(
|
||||
query=urlencode({'q': query}), offset=offset)
|
||||
|
||||
if params['time_range']:
|
||||
if params['time_range'] in time_range_dict:
|
||||
params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
|
||||
|
||||
return params
|
||||
|
||||
@@ -185,7 +185,7 @@ def request(query, params):
|
||||
query=urlencode({'q': query}),
|
||||
hostname=google_hostname,
|
||||
lang=url_lang)
|
||||
if params['time_range']:
|
||||
if params['time_range'] in time_range_dict:
|
||||
params['url'] += time_range_search.format(range=time_range_dict[params['time_range']])
|
||||
|
||||
params['headers']['Accept-Language'] = language
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
"""
|
||||
|
||||
from urllib import urlencode
|
||||
from urlparse import parse_qs
|
||||
from json import loads
|
||||
from lxml import html
|
||||
|
||||
@@ -39,7 +38,7 @@ def request(query, params):
|
||||
params['url'] = search_url.format(query=urlencode({'q': query}),
|
||||
offset=offset,
|
||||
safesearch=safesearch)
|
||||
if params['time_range']:
|
||||
if params['time_range'] in time_range_dict:
|
||||
params['url'] += time_range_search.format(range=time_range_dict[params['time_range']])
|
||||
|
||||
if safesearch and params['safesearch']:
|
||||
|
||||
@@ -58,7 +58,7 @@ def parse_url(url_string):
|
||||
|
||||
|
||||
def _get_url(query, offset, language, time_range):
|
||||
if time_range:
|
||||
if time_range in time_range_dict:
|
||||
return base_url + search_url_with_time.format(offset=offset,
|
||||
query=urlencode({'p': query}),
|
||||
lang=language,
|
||||
|
||||
Reference in New Issue
Block a user