diff options
| author | potato <mail@crazypotato.tk> | 2016-09-06 11:47:34 +0200 |
|---|---|---|
| committer | potato <mail@crazypotato.tk> | 2016-09-06 11:47:34 +0200 |
| commit | 9d08c81f47325ceea6d6ae1bda594fc8b8ee7764 (patch) | |
| tree | d7dba53107567f08c89ad12f24d5a10f986f5643 /searx/webapp.py | |
| parent | f4525880ed5f965ac4c241638933842a27a2acf7 (diff) | |
| parent | 55abf07a4f80f74fbcfbeddaee4f8591216802cd (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx
Diffstat (limited to 'searx/webapp.py')
| -rw-r--r-- | searx/webapp.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/searx/webapp.py b/searx/webapp.py index 800bde004..f76281a5d 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -395,11 +395,9 @@ def index(): search.paging = True if search.request_data.get('format', 'html') == 'html': - if 'content' in result: - result['content'] = highlight_content(result['content'], - search.query.encode('utf-8')) # noqa - result['title'] = highlight_content(result['title'], - search.query.encode('utf-8')) + if 'content' in result and result['content']: + result['content'] = highlight_content(result['content'][:1024], search.query.encode('utf-8')) + result['title'] = highlight_content(result['title'], search.query.encode('utf-8')) else: if result.get('content'): result['content'] = html_to_text(result['content']).strip() @@ -559,7 +557,6 @@ def preferences(): lang = request.preferences.get_value('language') disabled_engines = request.preferences.engines.get_disabled() allowed_plugins = request.preferences.plugins.get_enabled() - results_on_new_tab = request.preferences.get_value('results_on_new_tab') # stats for preferences page stats = {} @@ -732,7 +729,8 @@ def run(): debug=settings['general']['debug'], use_debugger=settings['general']['debug'], port=settings['server']['port'], - host=settings['server']['bind_address'] + host=settings['server']['bind_address'], + threaded=True ) |