diff options
| author | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2014-10-26 19:11:28 +0100 |
|---|---|---|
| committer | Thomas Pointhuber <thomas.pointhuber@gmx.at> | 2014-10-26 19:11:28 +0100 |
| commit | 0e1035eac1a3359edb44c998abc7f76d6f7ad985 (patch) | |
| tree | 3ef91532383f713324239a6797f0219da129236f /searx/engines/__init__.py | |
| parent | c36c935b03cc87ddfcac5ce3ded333be73387a7a (diff) | |
| parent | 79f1676e318d36704687966fd124b7f29ddc21fa (diff) | |
Merge https://github.com/asciimoo/searx into template_oscar
Conflicts:
searx/translations/de/LC_MESSAGES/messages.po
searx/translations/en/LC_MESSAGES/messages.po
searx/translations/es/LC_MESSAGES/messages.po
searx/translations/fr/LC_MESSAGES/messages.po
searx/translations/hu/LC_MESSAGES/messages.po
searx/translations/it/LC_MESSAGES/messages.po
searx/translations/nl/LC_MESSAGES/messages.po
searx/webapp.py
Diffstat (limited to 'searx/engines/__init__.py')
| -rw-r--r-- | searx/engines/__init__.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py index e63dd7189..80356a8cd 100644 --- a/searx/engines/__init__.py +++ b/searx/engines/__init__.py @@ -41,7 +41,7 @@ def load_module(filename): module.name = modname return module -if not 'engines' in settings or not settings['engines']: +if 'engines' not in settings or not settings['engines']: print '[E] Error no engines found. Edit your settings.yml' exit(2) @@ -68,15 +68,15 @@ for engine_data in settings['engines']: engine.categories = ['general'] if not hasattr(engine, 'language_support'): - #engine.language_support = False + # engine.language_support = False engine.language_support = True if not hasattr(engine, 'timeout'): - #engine.language_support = False + # engine.language_support = False engine.timeout = settings['server']['request_timeout'] if not hasattr(engine, 'shortcut'): - #engine.shortcut = ''' + # engine.shortcut = ''' engine.shortcut = '' # checking required variables @@ -161,7 +161,8 @@ def get_engines_stats(): for engine in scores_per_result: if max_score_per_result: - engine['percentage'] = int(engine['avg'] / max_score_per_result * 100) + engine['percentage'] = int(engine['avg'] + / max_score_per_result * 100) else: engine['percentage'] = 0 |