c434762 · searx · git.iko.soy

Merge pull request #405 from pointhi/bug_fixes

some Bug fixes

commitc43476229b58f20dba62c0f623ae2dad96bc8525 authorAdam Tauber <asciimoo@gmail.com> dateMon 24 Aug 2015, 13:23 (11 years ago) parent3a8eafc 996c96f

3 files changed+14−2

unifiedsplit

searx/__init__.py+1−1

@@ -40,7 +40,7 @@ else:

4040with open(settings_path) as settings_yaml:

4141 settings = load(settings_yaml)

4242

43−if settings.get('server', {}).get('debug'):

43+if settings.get('general', {}).get('debug'):

4444 logging.basicConfig(level=logging.DEBUG)

4545else:

4646 logging.basicConfig(level=logging.WARNING)

searx/engines/startpage.py+9−1

@@ -66,7 +66,15 @@ def response(resp):

6666 url = link.attrib.get('href')

6767

6868 # block google-ad url's

69− if re.match("^http(s|)://www.google.[a-z]+/aclk.*$", url):

69+ if re.match("^http(s|)://(www\.)?google\.[a-z]+/aclk.*$", url):

70+ continue

71+

72+ # block startpage search url's

73+ if re.match("^http(s|)://(www\.)?startpage\.com/do/search\?.*$", url):

74+ continue

75+

76+ # block ixquick search url's

77+ if re.match("^http(s|)://(www\.)?ixquick\.com/do/search\?.*$", url):

7078 continue

7179

7280 title = escape(extract_text(link))

searx/search.py+4

@@ -206,6 +206,10 @@ def score_results(results):

206206 # if there is no duplicate found, append result

207207 else:

208208 res['score'] = score

209+ # if the result has no scheme, use http as default

210+ if res['parsed_url'].scheme == '':

211+ res['parsed_url'] = res['parsed_url']._replace(scheme="http")

212+

209213 results.append(res)

210214

211215 results = sorted(results, key=itemgetter('score'), reverse=True)