[Moin-devel] CVS: MoinMoin/action DeletePage.py,1.11,1.12 LocalSiteMap.py,1.4,1.5 SpellCheck.py,1.21,1.22 links.py,1.3,1.4

[J?rgen Hermann]

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

Modified Files:
	DeletePage.py LocalSiteMap.py SpellCheck.py links.py 
Log Message:
getPageLinks(request)


Index: DeletePage.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/action/DeletePage.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** DeletePage.py	16 Apr 2002 21:03:34 -0000	1.11
--- DeletePage.py	17 Apr 2002 20:33:33 -0000	1.12
***************
*** 48,52 ****
  
          # Delete the page
!         page.deletePage()
  
          # Redirect to RecentChanges
--- 48,52 ----
  
          # Delete the page
!         page.deletePage(request)
  
          # Redirect to RecentChanges

Index: LocalSiteMap.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/action/LocalSiteMap.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** LocalSiteMap.py	16 Apr 2002 21:03:34 -0000	1.4
--- LocalSiteMap.py	17 Apr 2002 20:33:33 -0000	1.5
***************
*** 51,55 ****
      """
  
!     print LocalSiteMap(pagename).output()
      wikiutil.send_footer(pagename)
  
--- 51,55 ----
      """
  
!     print LocalSiteMap(pagename).output(request)
      wikiutil.send_footer(pagename)
  
***************
*** 60,65 ****
          self.result = []
  
!     def output(self):
!         tree = PageTreeBuilder().build_tree(self.name)
          #self.append("<small>")
          tree.depth_first_visit(self)
--- 60,65 ----
          self.result = []
  
!     def output(self, request):
!         tree = PageTreeBuilder(request).build_tree(self.name)
          #self.append("<small>")
          tree.depth_first_visit(self)
***************
*** 83,87 ****
  
  class PageTreeBuilder:
!     def __init__(self):
          self.children = {}
          self.numnodes = 0
--- 83,88 ----
  
  class PageTreeBuilder:
!     def __init__(self, request):
!         self.request = request
          self.children = {}
          self.numnodes = 0
***************
*** 104,108 ****
          # does not recurse
          kids = []
!         for child in Page(name).getPageLinks():            
              if self.is_ok(child):
                  kids.append(child)
--- 105,109 ----
          # does not recurse
          kids = []
!         for child in Page(name).getPageLinks(self.request):            
              if self.is_ok(child):
                  kids.append(child)

Index: SpellCheck.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/action/SpellCheck.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** SpellCheck.py	16 Apr 2002 21:03:34 -0000	1.21
--- SpellCheck.py	17 Apr 2002 20:33:33 -0000	1.22
***************
*** 111,115 ****
      if words and words[-1] != '\n':
          words = words + '\n'
!     lsw_page.save_text(words + '\n' + newwords, '0')
  
  
--- 111,115 ----
      if words and words[-1] != '\n':
          words = words + '\n'
!     lsw_page.save_text(request, words + '\n' + newwords, '0')
  
  

Index: links.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/action/links.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** links.py	16 Apr 2002 21:03:34 -0000	1.3
--- links.py	17 Apr 2002 20:33:33 -0000	1.4
***************
*** 39,43 ****
          else:
              _emit(name)
!         for link in pages[name].getPageLinks():
              if mimetype == "text/html":
                  if pages.has_key(link):
--- 39,43 ----
          else:
              _emit(name)
!         for link in pages[name].getPageLinks(request):
              if mimetype == "text/html":
                  if pages.has_key(link):