[fix] time range detection

This commit is contained in:
Adam Tauber 2016-07-26 00:22:05 +02:00
parent 3a8d193d1f
commit 350a84520d
10 changed files with 10 additions and 7 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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']:

View file

@ -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,