1.1 --- a/EventAggregatorSupport.py Tue Jul 10 23:55:53 2012 +0200
1.2 +++ b/EventAggregatorSupport.py Wed Jul 11 00:46:55 2012 +0200
1.3 @@ -772,14 +772,8 @@
1.4 fmt.page = page = self.page
1.5 request = page.request
1.6
1.7 - # Suppress line anchors.
1.8 -
1.9 parser_cls = self.getParserClass(self.getFormat())
1.10 - parser = parser_cls(text, request, line_anchors=False)
1.11 -
1.12 - # Fix lists by indicating that a paragraph is already started.
1.13 -
1.14 - return redirectedOutput(request, parser, fmt, inhibit_p=True)
1.15 + return formatText(text, request, fmt, parser_cls)
1.16
1.17 # Event details.
1.18
1.19 @@ -3419,6 +3413,30 @@
1.20
1.21 # Event-only formatting.
1.22
1.23 +def formatEvent(event, request, fmt):
1.24 +
1.25 + "Format the given 'event' using the 'request' and formatter 'fmt'."
1.26 +
1.27 + event_details = event.getDetails()
1.28 + write = request.write
1.29 +
1.30 + write(fmt.definition_list(on=1))
1.31 +
1.32 + for term in ("title", "summary", "start", "end", "description", "link",
1.33 + "location", "geo", "topics", "categories"):
1.34 +
1.35 + if event_details.has_key(term):
1.36 + value = event_details[term]
1.37 + if value:
1.38 + write(fmt.definition_term(on=1))
1.39 + write(fmt.text(term))
1.40 + write(fmt.definition_term(on=0))
1.41 + write(fmt.definition_desc(on=1))
1.42 + write(formatText(str(value), request, fmt))
1.43 + write(fmt.definition_desc(on=0))
1.44 +
1.45 + write(fmt.definition_list(on=0))
1.46 +
1.47 def formatEventsForOutputType(events, request, mimetype, parent=None, descriptions=None, latest_timestamp=None):
1.48
1.49 """