Ticket #308: changeset_2164.diff

trac/TracRedirect/redirect/redirect.py

@@ -45 +45 @@
 
 import re
 from trac.core import Component, implements
 from trac.wiki.api import WikiSystem, IWikiMacroProvider
 from trac.web.api import IRequestFilter
 from trac.web.chrome import ITemplateProvider, INavigationContributor, add_stylesheet
 from trac.wiki.formatter import Formatter
 from trac.util import Markup, arity
 from StringIO import StringIO
 
-HREF_RE = re.compile(r'^.*href="([^"]*)".*$')
+HREF_RE = re.compile(r'^.*href="([^"]*)".*$') #"rlrj60
 
 
 class RedirectFormatter(Formatter):
 
     def __init__(self, *args, **kwargs):
         Formatter.__init__(self, *args, **kwargs)
         self.formatted_link = None
         self.missing = False
 
     def format(self, text):
@@ -71 +71 @@
 
     def _shref_formatter(self, match, fullmatch):
         if not self.formatted_link:
             namespace = fullmatch.group('sns')
             target = self._unquote(fullmatch.group('stgt'))
             if namespace == 'wiki':
                 pagename = self.split_link(target)[0].split('@')[0]
                 if not WikiSystem(self.env).has_page(pagename):
                     self.missing = True
             # compat: the signature changed between 0.11 and 0.11.1
-            if 6 == arity(self._make_link):
+            # FIXME:rlrj60:6/29/2011: port to 0.12.2
+            # if 6 == arity(self._make_link):
+            if True:
                 self.formatted_link = self._make_link(namespace, target, match, match, fullmatch)
             else:
                 self.formatted_link = self._make_link(namespace, target, match, match)
         return self.formatted_link
 
 
 class TracRedirect(Component):
 
     implements(IWikiMacroProvider, ITemplateProvider, INavigationContributor, IRequestFilter)
 
     # IWikiMacroProvider methods
     def expand_macro(self, formatter, name, args):
         """
         Main routine of the wiki macro.
         """
         context = formatter.context
         req = context.req
 
         preview = req.args.get('preview', '')
         should_redirect = req.args.get('redirect', 'yes') == 'yes' and (not preview)
-        curpage = context.resource.id or 'WikiStart'
+        #FIXME:rlrj60:6/29/2011: covert unicode id to string
+        curpage = str(context.resource.id) or 'WikiStart'
 
         out = StringIO()
         link, missing = RedirectFormatter(self.env, context).format(args)
     
         if link and not missing:
             out.write('<div class="system-message">')
             out.write('<strong>Redirect: </strong>')
             out.write('This page redirects to %s ' % link)
             out.write('</div>')
 
-            self.log.debug('Redirect target=>>%s<<' %link)
-
+            self.log.debug('Redirect target=>>%s<<' % link)
+            
             if should_redirect:
-                link_target = HREF_RE.match(str(link)).group(1)
-
-                out.write('<form id="redirect" method="GET" action="%s">' % link_target)
-                out.write('<input type="hidden" name="redirectedfrom" value="%s">' % curpage)
-                out.write('</form>')
-    
-                out.write('\n')
-                out.write('<script language="JavaScript">\n')
-                out.write('document.forms["redirect"].submit();\n')
-                out.write('</script>\n')
-    
+                try:
+                    link_target = HREF_RE.match(str(link)).group(1)
+                
+                    out.write('<form id="redirect" method="GET" action="%s">' % link_target)
+                    out.write('<input type="hidden" name="redirectedfrom" value="%s">' % curpage)
+                    out.write('</form>')
+        
+                    out.write('\n')
+                    out.write('<script language="JavaScript">\n')
+                    out.write('document.forms["redirect"].submit();\n')
+                    out.write('</script>\n')
+                
+                # FIXME:rlrj60:6/29/2011: handle missing ticket/page
+                except AttributeError:
+                    # Internal link to a non-existing page
+                    out.write('<div class="system-message">')
+                    out.write('<strong>Redirection Error: </strong>')
+                    out.write('Redirection target not found: %s' % link)
+                    out.write('</div>')
+                    
         elif link and missing:
             # Internal link to a non-existing page
             out.write('<div class="system-message">')
             out.write('<strong>Redirection Error: </strong>')
             out.write('Redirection target not found: %s' % link)
             out.write('</div>')
     
         else:
             # No arguments given to the redirect macro
             out.write('<div class="system-message">')
             out.write('<strong>Redirection Error: </strong>')
             out.write('No redirection target given')
             out.write('</div>')
-    
+        
         return out.getvalue()
     
     def get_macros(self):
         yield 'redirect'
 
     def get_macro_description(self, name):
         from inspect import getdoc, getmodule
         return getdoc(getmodule(self))