equal
deleted
inserted
replaced
14 templates = template.TemplateLoader("templates", |
14 templates = template.TemplateLoader("templates", |
15 _helper_class = helpers.Helpers, |
15 _helper_class = helpers.Helpers, |
16 urls = urls, |
16 urls = urls, |
17 channel_list = channels.channel_list, |
17 channel_list = channels.channel_list, |
18 ) |
18 ) |
|
19 |
|
20 # our LogSearch thing |
|
21 # XXX: move elsewhere |
|
22 import log_search |
|
23 search_index = log_search.LogSearchIndex("logs/index", 'r') |
19 |
24 |
20 def index (request) : |
25 def index (request) : |
21 """ |
26 """ |
22 The topmost index page, display a list of available channels, perhaps some general stats |
27 The topmost index page, display a list of available channels, perhaps some general stats |
23 """ |
28 """ |
156 """ |
161 """ |
157 |
162 |
158 # got a search query? |
163 # got a search query? |
159 if q : |
164 if q : |
160 # do search |
165 # do search |
161 lines = channel.source.get_search(q) |
166 lines = search_index.search_simple(channel, q) |
162 |
167 |
163 # format |
168 # format |
164 lines = formatter.format_html(lines) |
169 lines = formatter.format_html(lines, full_timestamps=True) |
165 |
170 |
166 else : |
171 else : |
167 lines = None |
172 lines = None |
168 |
173 |
169 # render |
174 # render |
170 return templates.render_to_response("channel_search", |
175 return templates.render_to_response("channel_search", |
171 req = request, |
176 req = request, |
172 prefs = request.prefs, |
177 prefs = request.prefs, |
173 channel = channel, |
178 channel = channel, |
174 query = q, |
179 search_query = q, |
175 lines = lines, |
180 lines = lines, |
176 ) |
181 ) |
177 |
182 |
178 |
183 |
179 |
184 |