1.1 --- a/macros/EventAggregator.py Mon Jul 18 00:28:55 2011 +0200
1.2 +++ b/macros/EventAggregator.py Wed Jul 20 00:53:40 2011 +0200
1.3 @@ -1318,8 +1318,6 @@
1.4 page = fmt.page
1.5 _ = request.getText
1.6
1.7 - parser_cls = getParserClass(request, page.pi["format"])
1.8 -
1.9 # Interpret the arguments.
1.10
1.11 try:
1.12 @@ -1332,6 +1330,7 @@
1.13 # Get special arguments.
1.14
1.15 category_names = []
1.16 + remote_sources = []
1.17 raw_calendar_start = None
1.18 raw_calendar_end = None
1.19 calendar_start = None
1.20 @@ -1368,6 +1367,9 @@
1.21 elif arg.startswith("map="):
1.22 map_name = arg[4:]
1.23
1.24 + elif arg.startswith("source="):
1.25 + remote_sources.append(arg[7:])
1.26 +
1.27 else:
1.28 category_names.append(arg)
1.29
1.30 @@ -1397,10 +1399,11 @@
1.31
1.32 # Get the events according to the resolution of the calendar.
1.33
1.34 - event_pages = getPagesFromResults(getAllCategoryPages(category_names, request), request)
1.35 - events = getEventsFromPages(event_pages)
1.36 - all_shown_events = getEventsInPeriod(events, getCalendarPeriod(calendar_start, calendar_end))
1.37 - earliest, latest = getEventLimits(all_shown_events)
1.38 + pages = getPagesFromResults(getAllCategoryPages(category_names, request), request)
1.39 + events = getEventsFromResources(getEventPages(pages))
1.40 + events += getEventsFromResources(getEventResources(remote_sources, calendar_start, calendar_end, request))
1.41 + all_shown_events = getEventsInPeriod(events, getCalendarPeriod(calendar_start, calendar_end))
1.42 + earliest, latest = getEventLimits(all_shown_events)
1.43
1.44 # Get a concrete period of time.
1.45
1.46 @@ -1486,7 +1489,7 @@
1.47 output.append(fmt.table_cell(on=1, attrs=attrs))
1.48
1.49 if event_details.has_key("location"):
1.50 - output.append(formatText(event_details["location"], request, fmt, parser_cls))
1.51 + output.append(event_page.formatText(event_details["location"], request, fmt))
1.52
1.53 output.append(fmt.table_cell(on=0))
1.54
1.55 @@ -1786,7 +1789,7 @@
1.56
1.57 if event_details.has_key("location"):
1.58 output.append(fmt.paragraph(on=1))
1.59 - output.append(formatText(event_details["location"], request, fmt, parser_cls))
1.60 + output.append(event_page.formatText(event_details["location"], request, fmt))
1.61 output.append(fmt.paragraph(on=1))
1.62
1.63 # Topics.
1.64 @@ -1796,7 +1799,7 @@
1.65
1.66 for topic in event_details.get("topics") or event_details.get("categories") or []:
1.67 output.append(fmt.listitem(on=1))
1.68 - output.append(formatText(topic, request, fmt, parser_cls))
1.69 + output.append(event_page.formatText(topic, request, fmt))
1.70 output.append(fmt.listitem(on=0))
1.71
1.72 output.append(fmt.bullet_list(on=0))