equal
deleted
inserted
replaced
153 date = date, |
153 date = date, |
154 lines = lines, |
154 lines = lines, |
155 ) |
155 ) |
156 |
156 |
157 @preferences.handler(prefs.formatter) |
157 @preferences.handler(prefs.formatter) |
158 def channel_search (request, channel, formatter, q=None) : |
158 def channel_search (request, channel, formatter, q=None, count=None, skip=None) : |
159 """ |
159 """ |
160 Display the search form for the channel for GET, or do the search for POST |
160 Display the search form for the channel for GET, or do the search for POST |
161 """ |
161 """ |
162 |
162 |
163 # got a search query? |
163 # got a search query? |
164 if q : |
164 if q : |
165 # do search |
165 # do search |
166 lines = search_index.search_simple(channel, q) |
166 lines = search_index.search_simple(channel, q, count, skip) |
167 |
167 |
168 # format |
168 # format |
169 lines = formatter.format_html(lines, full_timestamps=True) |
169 lines = formatter.format_html(lines, full_timestamps=True) |
170 |
170 |
171 else : |
171 else : |