Wiki-format search results. Ignore trailing slashes on wiki page names.

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@100 af82e41b-90c4-0310-8c96-b1721e28e2e2

trac/Module.py

@@ -44,6 +44,7 @@ def run(self):
             self.cgi.hdf.setValue('error.action', e.action)
             self.cgi.hdf.setValue('error.message', str(e))
             self.template_name = 'error.cs'
+            Module.apply_template(self)
         except Exception, e:
             # Catch exceptions and let error.cs display
             # a pretty error message + traceback.

trac/Search.py

@@ -24,6 +24,7 @@
 from util import *
 from Href import href
 from Module import Module
+from Wiki import wiki_to_oneliner
 import db
 import perm
 
@@ -71,7 +72,7 @@ def perform_query (self, query, changeset, tickets):
             if not row:
                 break
             item = {'type': row['type'],
-                    'message': row['message'],
+                    'message': wiki_to_oneliner(row['message']),
                     'data': row['data'],
                     'author': row['author']}
             if row['type'] == '1':

trac/trac.py

@@ -70,7 +70,7 @@ def parse_args():
     if re.search('/search/?', info):
         args['mode'] = 'search'
         return args
-    match = re.search('/wiki/(.*)/?', info)
+    match = re.search('/wiki/(.*[^/])/?', info)
     if match:
         args['mode'] = 'wiki'
         if len(match.group(1)) > 0:
@@ -124,7 +124,6 @@ def main():
         args[x] = _args[x].value
 
     mode = dict_get_with_default(args, 'mode', 'wiki')
-
     module_name, constructor_name, need_svn = modules[mode]
     module = __import__(module_name, globals(),  locals(), [])
     constructor = getattr(module, constructor_name)