1.1 --- a/macros/EventAggregator.py Sun Nov 18 19:22:17 2012 +0100
1.2 +++ b/macros/EventAggregator.py Sun Nov 18 21:16:00 2012 +0100
1.3 @@ -77,6 +77,7 @@
1.4
1.5 category_names = []
1.6 remote_sources = []
1.7 + search_pattern = None
1.8 raw_calendar_start = None
1.9 raw_calendar_end = None
1.10 calendar_start = None
1.11 @@ -116,6 +117,9 @@
1.12 elif arg.startswith("source="):
1.13 remote_sources.append(arg[7:])
1.14
1.15 + elif arg.startswith("search="):
1.16 + search_pattern = arg[7:]
1.17 +
1.18 else:
1.19 category_names.append(arg)
1.20
1.21 @@ -145,22 +149,16 @@
1.22
1.23 # Get the events according to the resolution of the calendar.
1.24
1.25 - pages = getPagesFromResults(getAllCategoryPages(category_names, request), request)
1.26 - events = getEventsFromResources(getEventPages(pages))
1.27 - events += getEventsFromResources(getEventResources(remote_sources, calendar_start, calendar_end, request))
1.28 - all_shown_events = getEventsInPeriod(events, getCalendarPeriod(calendar_start, calendar_end))
1.29 - earliest, latest = getEventLimits(all_shown_events)
1.30 -
1.31 - # Get a concrete period of time.
1.32 -
1.33 - first, last = getConcretePeriod(calendar_start, calendar_end, earliest, latest, resolution)
1.34 + all_shown_events, first, last = getEventsUsingParameters(
1.35 + category_names, search_pattern, remote_sources, calendar_start, calendar_end,
1.36 + resolution, request)
1.37
1.38 # Define a view of the calendar, retaining useful navigational information.
1.39
1.40 view = View(page, calendar_name, raw_calendar_start, raw_calendar_end,
1.41 original_calendar_start, original_calendar_end, calendar_start, calendar_end,
1.42 - first, last, category_names, remote_sources, template_name, parent_name,
1.43 - mode, resolution, name_usage, map_name)
1.44 + first, last, category_names, remote_sources, search_pattern, template_name,
1.45 + parent_name, mode, resolution, name_usage, map_name)
1.46
1.47 return view.render(all_shown_events)
1.48