[Moin-devel] CVS: MoinMoin wikimacro.py,1.41,1.42 wikiutil.py,1.98,1.99

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv28247

Modified Files:
	wikimacro.py wikiutil.py 
Log Message:
Bugfix for $PAGE handling in InterWiki macro


Index: wikimacro.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikimacro.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** wikimacro.py	25 Apr 2002 19:32:30 -0000	1.41
--- wikimacro.py	9 May 2002 21:09:37 -0000	1.42
***************
*** 205,210 ****
          list.sort()
          for tag, url in list:
!             buf.write('<tr><td><tt><a href="%sRecentChanges">%s</a>  </tt></td>' % (url, tag))
!             buf.write('<td><tt><a href="%s">%s</a></tt></td>' % (url, url))
              buf.write('</tr>\n')
          buf.write('</table>')
--- 205,214 ----
          list.sort()
          for tag, url in list:
!             buf.write('<tr><td><tt><a href="%s">%s</a>  </tt></td>' % (
!                 wikiutil.join_wiki(url, 'RecentChanges'), tag))
!             if string.find(url, '$PAGE') == -1:
!                 buf.write('<td><tt><a href="%s">%s</a></tt></td>' % (url, url))
!             else:
!                 buf.write('<td><tt>%s</tt></td>' % url)
              buf.write('</tr>\n')
          buf.write('</table>')

Index: wikiutil.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -r1.98 -r1.99
*** wikiutil.py	9 May 2002 18:53:45 -0000	1.98
--- wikiutil.py	9 May 2002 21:09:37 -0000	1.99
***************
*** 123,126 ****
--- 123,136 ----
      return (wikitag, tail)
  
+ 
+ def join_wiki(wikiurl, wikitail):
+     """ add a page name to an interwiki url
+     """
+     if string.find(wikiurl, '$PAGE') == -1:
+         return wikiurl + wikitail
+     else:
+         return string.replace(wikiurl, '$PAGE', wikitail)
+ 
+ 
  def resolve_wiki(wikiurl):
      """ return tuple of wikitag, wikiurl, wikitail """