equal
deleted
inserted
replaced
7 from qmsk.web import http, template |
7 from qmsk.web import http, template |
8 |
8 |
9 import urls, channels, helpers |
9 import urls, channels, helpers |
10 import preferences as prefs |
10 import preferences as prefs |
11 from preferences import preferences |
11 from preferences import preferences |
|
12 import config |
12 |
13 |
13 # load templates from here |
14 # load templates from here |
14 templates = template.TemplateLoader("templates", |
15 templates = template.TemplateLoader("templates", |
15 _helper_class = helpers.Helpers, |
16 _helper_class = helpers.Helpers, |
16 urls = urls, |
17 urls = urls, |
17 channel_list = channels.channel_list, |
18 channel_list = config.LOG_CHANNELS, |
|
19 config = config, |
18 ) |
20 ) |
19 |
21 |
20 # our LogSearch thing |
22 # our LogSearch thing |
21 # XXX: move elsewhere |
23 # XXX: move elsewhere |
22 import log_search |
24 import log_search |
160 channel = channel, |
162 channel = channel, |
161 date = date, |
163 date = date, |
162 lines = lines, |
164 lines = lines, |
163 ) |
165 ) |
164 |
166 |
165 @preferences.handler(prefs.formatter) |
167 @preferences.handler(prefs.formatter, prefs.count) |
166 def channel_search (request, channel, formatter, q=None, count=None, skip=None) : |
168 def channel_search (request, channel, formatter, count, q=None, skip=0, max=None) : |
167 """ |
169 """ |
168 Display the search form for the channel for GET, or do the search for POST |
170 Display the search form for the channel for GET, or do the search for POST |
169 """ |
171 """ |
170 |
172 |
171 # got a search query? |
173 # got a search query? |
183 return templates.render_to_response("channel_search", |
185 return templates.render_to_response("channel_search", |
184 req = request, |
186 req = request, |
185 prefs = request.prefs, |
187 prefs = request.prefs, |
186 channel = channel, |
188 channel = channel, |
187 search_query = q, |
189 search_query = q, |
|
190 count = count, |
|
191 skip = skip, |
|
192 max = max, |
188 lines = lines, |
193 lines = lines, |
189 ) |
194 ) |
190 |
195 |
191 |
196 |
192 |
197 |