[Moin-devel] CVS: MoinMoin/macro OrphanedPages.py,1.4,1.5 PageSize.py,1.3,1.4 RandomPage.py,1.3,1.4 WantedPages.py,1.6,1.7

[J?rgen Hermann]

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

Modified Files:
	OrphanedPages.py PageSize.py RandomPage.py WantedPages.py 
Log Message:
Macro-generated pagelinks are no longer added to the list of links;
WantedPages now highlights the wanted page on the wanting pages


Index: OrphanedPages.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/OrphanedPages.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** OrphanedPages.py	24 Nov 2001 02:30:58 -0000	1.4
--- OrphanedPages.py	20 Mar 2002 23:57:07 -0000	1.5
***************
*** 43,47 ****
          if not name: continue
          result = result + macro.formatter.listitem(1)
!         result = result + macro.formatter.pagelink(name)
          result = result + macro.formatter.listitem(0)
      result = result + macro.formatter.number_list(0)
--- 43,47 ----
          if not name: continue
          result = result + macro.formatter.listitem(1)
!         result = result + macro.formatter.pagelink(name, generated=1)
          result = result + macro.formatter.listitem(0)
      result = result + macro.formatter.number_list(0)

Index: PageSize.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/PageSize.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PageSize.py	16 Jan 2002 22:14:34 -0000	1.3
--- PageSize.py	20 Mar 2002 23:57:07 -0000	1.4
***************
*** 32,36 ****
              string.replace("%6d" % size, " ", " ") + " " +
              macro.formatter.code(0) + 
!             macro.formatter.pagelink(page.page_name) + 
              macro.formatter.listitem(0)
          )
--- 32,36 ----
              string.replace("%6d" % size, " ", " ") + " " +
              macro.formatter.code(0) + 
!             macro.formatter.pagelink(page.page_name, generated=1) + 
              macro.formatter.listitem(0)
          )

Index: RandomPage.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/RandomPage.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** RandomPage.py	9 Dec 2000 09:01:02 -0000	1.3
--- RandomPage.py	20 Mar 2002 23:57:07 -0000	1.4
***************
*** 29,33 ****
  
      # return a single page link
!     if links == 1: return macro.formatter.pagelink(pages[0])
  
      # return a list of page links
--- 29,33 ----
  
      # return a single page link
!     if links == 1: return macro.formatter.pagelink(pages[0], generated=1)
  
      # return a list of page links
***************
*** 36,40 ****
      for name in pages:
          result = result + macro.formatter.listitem(1)
!         result = result + macro.formatter.pagelink(name)
          result = result + macro.formatter.listitem(0)
      result = result + macro.formatter.bullet_list(0)
--- 36,40 ----
      for name in pages:
          result = result + macro.formatter.listitem(1)
!         result = result + macro.formatter.pagelink(name, generated=1)
          result = result + macro.formatter.listitem(0)
      result = result + macro.formatter.bullet_list(0)

Index: WantedPages.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/WantedPages.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** WantedPages.py	24 Nov 2001 02:30:58 -0000	1.6
--- WantedPages.py	20 Mar 2002 23:57:07 -0000	1.7
***************
*** 9,13 ****
  
  # Imports
! import cgi, string
  from MoinMoin import config, user, wikiutil
  from MoinMoin.Page import Page
--- 9,13 ----
  
  # Imports
! import cgi, string, urllib
  from MoinMoin import config, user, wikiutil
  from MoinMoin.Page import Page
***************
*** 44,53 ****
      wantednames.sort()
      result = macro.formatter.number_list(1)
-     wherelink = lambda n, p=pages: p[n].link_to()
      for name in wantednames:
          if not name: continue
          result = result + macro.formatter.listitem(1)
!         result = result + macro.formatter.pagelink(name)
  
          where = wanted[name].keys()
          where.sort()
--- 44,54 ----
      wantednames.sort()
      result = macro.formatter.number_list(1)
      for name in wantednames:
          if not name: continue
          result = result + macro.formatter.listitem(1)
!         result = result + macro.formatter.pagelink(name, generated=1)
  
+         wherelink = lambda n, w=name, p=pages: \
+             p[n].link_to(querystr='action=highlight&value=%s' % urllib.quote_plus(w))
          where = wanted[name].keys()
          where.sort()