Changeset 3040

Timestamp:

10/28/05 01:19:43 (8 years ago)

Author:

moschny

Message:

Porting the redirect macro to trac 0.9 - first version.

File:

• trac/trunk/wiki-macros/redirect.py (modified) (3 diffs)

trac/trunk/wiki-macros/redirect.py

@@ -1 +1 @@
 # vim: expandtab tabstop=4
-from StringIO import StringIO
 import re
 import string
-from trac import WikiFormatter
-from trac.WikiFormatter import CommonFormatter
+from StringIO import StringIO
+from trac.wiki.formatter import Formatter
+from trac.wiki.api import WikiSystem
 
-NL = "\n"
+class MyFormatter(Formatter):
+
+    def format(self, text):
+        self.formatted_link = None
+        self.missing = False
+        class NullOut(object):
+            def write(self, data): pass
+        Formatter.format(self, text, NullOut())
+        return self.formatted_link, self.missing
+
+    def _shref_formatter(self, match, fullmatch):
+        if not self.formatted_link:
+            namespace = fullmatch.group('sns')
+            target    = fullmatch.group('stgt')
+            if target[0] in "'\"":
+                target = target[1:-1]
+            if namespace == 'wiki':
+                wiki = WikiSystem(self.env)
+                if not wiki.has_page(target):
+                    self.missing = True
+            self.formatted_link = self._make_link(namespace, target, match, match)
+        return
 
 def execute(hdf, args, env):
-    curpage = hdf.getValue('args.page', "")
+    curpage = hdf.getValue('wiki.page_name', "")
     if not curpage:
         curpage = 'WikiStart'
@@ -15 +36 @@
     preview = hdf.getValue('args.preview', "")
     shouldRedirect = (hdf.getValue('args.redirect', "yes") == "yes") and (not preview)
+
     db = env.get_db_cnx()
     out = StringIO()
-    fmt = CommonFormatter(hdf, env, db)
-
-    if args:
-        link, _, missing, _ = fmt._expand_module_link(args)
-
-    if not link and not missing:
-        # This is an external non-trac link
-        link = args
+    link, missing = MyFormatter(env, True, db).format(args)
 
     if link and not missing:
         out.write('<div class="system-message">')
         out.write('<strong>Redirect: </strong>')
-        out.write("This page is an alias for the real page located at ")
-        out.write('<a href="')
-        out.write(link)
-        out.write('">')
-        out.write(args)
-        out.write('</a>')
+        out.write('This page redirects to %s ' % link)
         out.write('</div>')
 
         if shouldRedirect:
-            out.write('<form id="redirect" method="POST" action="' + link + '">')
-            out.write('<input type="hidden" name="redirectedfrom" value="' + curpage + '">')
+            link_target = re.sub(r'^.*href="([^"]*)".*$', r'\1', link)
+
+            out.write('<form id="redirect" method="POST" action="%s">' % link_target)
+            out.write('<input type="hidden" name="redirectedfrom" value="%s">' % curpage)
             out.write('</form>')
 
-            out.write(NL)
-            out.write('<script language="JavaScript">' + NL)
-            out.write('document.forms["redirect"].submit();' + NL)
-            out.write('</script>' + NL)
+            out.write('\n')
+            out.write('<script language="JavaScript">\n')
+            out.write('document.forms["redirect"].submit();\n')
+            out.write('</script>\n')
 
     elif link and missing:
@@ -51 +63 @@
         out.write('<div class="system-message">')
         out.write('<strong>Redirection Error: </strong>')
-        out.write('Redirection target not found: ')
-        out.write('<a href="')
-        out.write(link)
-        out.write('">')
-        out.write(args)
-        out.write('</a>')
+        out.write('Redirection target not found: %s' % link)
         out.write('</div>')