1.1 --- a/actions/EventAggregatorSummary.py Fri Apr 08 00:42:20 2011 +0200
1.2 +++ b/actions/EventAggregatorSummary.py Sun Apr 10 00:07:27 2011 +0200
1.3 @@ -280,7 +280,7 @@
1.4 elif hasattr(request, "emit_http_headers"):
1.5 send_headers = request.emit_http_headers
1.6 else:
1.7 - send_headers = send_headers(request)
1.8 + send_headers = send_headers_cls(request)
1.9
1.10 # Define headers.
1.11
1.12 @@ -307,6 +307,9 @@
1.13 event_page = event.getPage()
1.14 event_details = event.getDetails()
1.15
1.16 + # NOTE: A custom formatter making attributes for links and plain
1.17 + # NOTE: text for values could be employed here.
1.18 +
1.19 # Get the summary details.
1.20
1.21 event_summary = event.getSummary(parent)
1.22 @@ -342,7 +345,8 @@
1.23
1.24 if event_details.get("topics") or event_details.get("categories"):
1.25 request.write("CATEGORIES:%s\r\n" % ",".join(
1.26 - [getQuotedText(topic) for topic in event_details.get("topics") or event_details.get("categories")]
1.27 + [getQuotedText(topic)
1.28 + for topic in event_details.get("topics") or event_details.get("categories")]
1.29 ))
1.30 if event_details.has_key("location"):
1.31 request.write("LOCATION:%s\r\n" % getQuotedText(event_details["location"]))
1.32 @@ -381,6 +385,11 @@
1.33 event_page = event.getPage()
1.34 event_details = event.getDetails()
1.35
1.36 + # Get a parser and formatter for the formatting of some attributes.
1.37 +
1.38 + parser_cls = getParserClass(request, event_page.getFormat())
1.39 + fmt = getFormatter(request, "text/html", event_page.page)
1.40 +
1.41 # Get the summary details.
1.42
1.43 event_summary = event.getSummary(parent)
1.44 @@ -398,10 +407,12 @@
1.45 else:
1.46 description = event_details["last-comment"]
1.47
1.48 - request.write('<description>%s</description>\r\n' % wikiutil.escape(description))
1.49 + request.write('<description>%s</description>\r\n' %
1.50 + formatText(description, request, fmt, parser_cls))
1.51
1.52 for topic in event_details.get("topics") or event_details.get("categories") or []:
1.53 - request.write('<category>%s</category>\r\n' % topic)
1.54 + request.write('<category>%s</category>\r\n' %
1.55 + formatText(topic, request, fmt, parser_cls))
1.56
1.57 request.write('<pubDate>%s</pubDate>\r\n' % getHTTPTimeString(event_details["created"]))
1.58 request.write('<guid>%s#%s</guid>\r\n' % (link, event_details["sequence"]))