1.1 --- a/actions/EventAggregatorUpdate.py Sun Nov 18 19:22:17 2012 +0100
1.2 +++ b/actions/EventAggregatorUpdate.py Sun Nov 18 21:16:00 2012 +0100
1.3 @@ -30,6 +30,7 @@
1.4
1.5 calendar_name = form.get("calendar", [None])[0]
1.6 category_names = form.get("category", [])
1.7 + search_pattern = form.get("search", [None])[0]
1.8 remote_sources = form.get("source", [])
1.9 name_usage = getParameter(request, "names", "weekly")
1.10 template_name = getParameter(request, "template")
1.11 @@ -63,22 +64,16 @@
1.12
1.13 # Get the events according to the resolution of the calendar.
1.14
1.15 - pages = getPagesFromResults(getAllCategoryPages(category_names, request), request)
1.16 - events = getEventsFromResources(getEventPages(pages))
1.17 - events += getEventsFromResources(getEventResources(remote_sources, calendar_start, calendar_end, request))
1.18 - all_shown_events = getEventsInPeriod(events, getCalendarPeriod(calendar_start, calendar_end))
1.19 - earliest, latest = getEventLimits(all_shown_events)
1.20 -
1.21 - # Get a concrete period of time.
1.22 -
1.23 - first, last = getConcretePeriod(calendar_start, calendar_end, earliest, latest, resolution)
1.24 + all_shown_events, first, last = getEventsUsingParameters(
1.25 + category_names, search_pattern, remote_sources, calendar_start, calendar_end,
1.26 + resolution, request)
1.27
1.28 # Define a view of the calendar, retaining useful navigational information.
1.29
1.30 view = View(page, calendar_name, raw_calendar_start, raw_calendar_end,
1.31 original_calendar_start, original_calendar_end, calendar_start, calendar_end,
1.32 - first, last, category_names, remote_sources, template_name, parent_name,
1.33 - mode, resolution, name_usage, map_name)
1.34 + first, last, category_names, remote_sources, search_pattern, template_name,
1.35 + parent_name, mode, resolution, name_usage, map_name)
1.36
1.37 send_headers = get_send_headers(request)
1.38 send_headers(["Content-Type: text/html; charset=%s" % config.charset])