1.1 --- a/EventAggregatorSupport.py Fri Apr 03 01:30:01 2009 +0200
1.2 +++ b/EventAggregatorSupport.py Sat Apr 04 01:32:45 2009 +0200
1.3 @@ -88,17 +88,18 @@
1.4 mapping.sort()
1.5 return mapping
1.6
1.7 -def getPageDate(page):
1.8 +def getPageRevision(page):
1.9
1.10 - # From MoinMoin.xmlrpc...
1.11 + # From Page.edit_info...
1.12
1.13 - if hasattr(page, "edit_info"):
1.14 - edit_info = page.edit_info()
1.15 + if hasattr(page, "editlog_entry"):
1.16 + line = page.editlog_entry()
1.17 else:
1.18 - edit_info = page.last_edit(page.request) # MoinMoin 1.5.x and 1.6.x
1.19 + line = page._last_edited(page.request) # MoinMoin 1.5.x and 1.6.x
1.20
1.21 - mtime = wikiutil.version2timestamp(long(edit_info['timestamp'])) # must be long for py 2.2.x
1.22 - return time.gmtime(mtime)
1.23 + timestamp = line.ed_time_usecs
1.24 + mtime = wikiutil.version2timestamp(long(timestamp)) # must be long for py 2.2.x
1.25 + return {"timestamp" : time.gmtime(mtime), "comment" : line.comment}
1.26
1.27 def getHTTPTimeString(tmtuple):
1.28 return "%s, %02d %s %04d %02d:%02d:%02d GMT" % (
1.29 @@ -465,9 +466,12 @@
1.30
1.31 # Get the created and last modified times.
1.32
1.33 - event_details["created"] = getPageDate(event_page_initial)
1.34 - event_details["last-modified"] = getPageDate(event_page)
1.35 + initial_revision = getPageRevision(event_page_initial)
1.36 + event_details["created"] = initial_revision["timestamp"]
1.37 + latest_revision = getPageRevision(event_page)
1.38 + event_details["last-modified"] = latest_revision["timestamp"]
1.39 event_details["sequence"] = len(revisions) - 1
1.40 + event_details["last-comment"] = latest_revision["comment"]
1.41
1.42 if latest is None or latest < event_details["last-modified"]:
1.43 latest = event_details["last-modified"]
2.1 --- a/actions/EventAggregatorSummary.py Fri Apr 03 01:30:01 2009 +0200
2.2 +++ b/actions/EventAggregatorSummary.py Sat Apr 04 01:32:45 2009 +0200
2.3 @@ -236,6 +236,7 @@
2.4 request.write('<item>\r\n')
2.5 request.write('<title>%s</title>\r\n' % wikiutil.escape(event_summary))
2.6 request.write('<link>%s</link>\r\n' % link)
2.7 + request.write('<description>%s</description>\r\n' % wikiutil.escape(event_details["last-comment"]))
2.8
2.9 for topic in event_details.get("topics") or event_details.get("categories") or []:
2.10 request.write('<category>%s</category>\r\n' % topic)