1.1 --- a/EventAggregatorSupport.py Sat Jan 21 23:59:22 2012 +0100
1.2 +++ b/EventAggregatorSupport.py Sun Jan 22 00:45:28 2012 +0100
1.3 @@ -445,14 +445,13 @@
1.4
1.5 "Return the URL of this page."
1.6
1.7 - request = self.page.request
1.8 - return request.getQualifiedURL(self.page.url(request, relative=0))
1.9 + return getPageURL(self.page)
1.10
1.11 def getFormat(self):
1.12
1.13 "Get the format used on this page."
1.14
1.15 - return self.page.pi["format"]
1.16 + return getFormat(self.page)
1.17
1.18 def getMetadata(self):
1.19
1.20 @@ -462,25 +461,8 @@
1.21 "last-comment" made about the last edit.
1.22 """
1.23
1.24 - request = self.page.request
1.25 -
1.26 - # Get the initial revision of the page.
1.27 -
1.28 - revisions = self.getRevisions()
1.29 - event_page_initial = Page(request, self.getPageName(), rev=revisions[-1])
1.30 -
1.31 - # Get the created and last modified times.
1.32 -
1.33 - initial_revision = getPageRevision(event_page_initial)
1.34 -
1.35 if self.metadata is None:
1.36 - self.metadata = {}
1.37 - self.metadata["created"] = initial_revision["timestamp"]
1.38 - latest_revision = self.getPageRevision()
1.39 - self.metadata["last-modified"] = latest_revision["timestamp"]
1.40 - self.metadata["sequence"] = len(revisions) - 1
1.41 - self.metadata["last-comment"] = latest_revision["comment"]
1.42 -
1.43 + self.metadata = getMetadata(self.page)
1.44 return self.metadata
1.45
1.46 def getRevisions(self):