@@ -25,6 +25,7 @@ from urlparse import urlparse
25from searx import settings
25from searx import settings
26import ConfigParser
26import ConfigParser
28from datetime import datetime
29from datetime import datetime
30engine_dir = dirname(realpath(__file__))
31engine_dir = dirname(realpath(__file__))
@@ -106,8 +107,17 @@ def highlight_content(content, query):
106 # TODO better html content detection
107 # TODO better html content detection
107 if content.find('<') != -1:
108 if content.find('<') != -1:
108 return content
109 return content
111+ if content.lower().find(query.lower()) > -1:
112+ query_regex = '({0})'.format(re.escape(query))
113+ content = re.sub(query_regex, '<b>\\1</b>', content, flags=re.I)
109− for chunk in query.split():
115+ for chunk in query.split():
110− content = content.replace(chunk, '<b>{0}</b>'.format(chunk))
116+ if len(chunk) == 1:
117+ query_regex = '(\W+{0}\W+)'.format(re.escape(chunk))
119+ query_regex = '({0})'.format(re.escape(chunk))
120+ content = re.sub(query_regex, '<b>\\1</b>', content, flags=re.I)
112 return content
122 return content