1.1 --- a/macros/EventAggregator.py Thu Mar 26 01:46:07 2009 +0100
1.2 +++ b/macros/EventAggregator.py Fri Mar 27 01:00:15 2009 +0100
1.3 @@ -44,39 +44,6 @@
1.4
1.5 # Macro functions.
1.6
1.7 -def getMonth(arg):
1.8 - n = None
1.9 -
1.10 - if arg.startswith("current"):
1.11 - date = EventAggregatorSupport.getCurrentMonth()
1.12 - if len(arg) > 8:
1.13 - n = int(arg[7:])
1.14 -
1.15 - elif arg.startswith("yearstart"):
1.16 - date = (EventAggregatorSupport.getCurrentYear(), 1)
1.17 - if len(arg) > 10:
1.18 - n = int(arg[9:])
1.19 -
1.20 - elif arg.startswith("yearend"):
1.21 - date = (EventAggregatorSupport.getCurrentYear(), 12)
1.22 - if len(arg) > 8:
1.23 - n = int(arg[7:])
1.24 -
1.25 - else:
1.26 - date = EventAggregatorSupport.getMonth(arg)
1.27 -
1.28 - if n is not None:
1.29 - date = EventAggregatorSupport.monthupdate(date, n)
1.30 -
1.31 - return date
1.32 -
1.33 -def getFormMonth(request, calendar_name, argname):
1.34 - arg = request.form.get("%s-%s" % (calendar_name, argname), [None])[0]
1.35 - if arg is not None:
1.36 - return getMonth(arg)
1.37 - else:
1.38 - return None
1.39 -
1.40 def execute(macro, args):
1.41
1.42 """
1.43 @@ -125,10 +92,10 @@
1.44
1.45 for arg in parsed_args:
1.46 if arg.startswith("start="):
1.47 - calendar_start = getMonth(arg[6:])
1.48 + calendar_start = EventAggregatorSupport.getParameterMonth(arg[6:])
1.49
1.50 elif arg.startswith("end="):
1.51 - calendar_end = getMonth(arg[4:])
1.52 + calendar_end = EventAggregatorSupport.getParameterMonth(arg[4:])
1.53
1.54 elif arg.startswith("mode="):
1.55 mode = arg[5:]
1.56 @@ -145,8 +112,8 @@
1.57 # Find request parameters to override settings.
1.58
1.59 if calendar_name is not None:
1.60 - calendar_start = getFormMonth(request, calendar_name, "start") or calendar_start
1.61 - calendar_end = getFormMonth(request, calendar_name, "end") or calendar_end
1.62 + calendar_start = EventAggregatorSupport.getFormMonth(request, calendar_name, "start") or calendar_start
1.63 + calendar_end = EventAggregatorSupport.getFormMonth(request, calendar_name, "end") or calendar_end
1.64
1.65 # Get the events.
1.66
1.67 @@ -383,9 +350,7 @@
1.68 if not (event_details["start"] <= date <= event_details["end"]):
1.69 continue
1.70
1.71 - # Get a pretty version of the page name.
1.72 -
1.73 - pretty_pagename = EventAggregatorSupport.getPrettyPageName(event_page)
1.74 + event_summary = EventAggregatorSupport.getEventSummary(event_page, event_details)
1.75
1.76 # Generate a colour for the event.
1.77
1.78 @@ -414,10 +379,10 @@
1.79
1.80 if not hide_text:
1.81 output.append(fmt.div(on=1, css_class=(" ".join(css_classes)), style=style))
1.82 - output.append(event_page.link_to_raw(request, wikiutil.escape(pretty_pagename)))
1.83 + output.append(event_page.link_to_raw(request, wikiutil.escape(event_summary)))
1.84 else:
1.85 output.append(fmt.div(on=1, css_class=(" ".join(css_classes)), style=hidden_style))
1.86 - output.append(fmt.text(pretty_pagename))
1.87 + output.append(fmt.text(event_summary))
1.88
1.89 output.append(fmt.div(on=0))
1.90
1.91 @@ -456,15 +421,13 @@
1.92
1.93 for event_page, event_details in shown_events.get((year, month), []):
1.94
1.95 - # Get a pretty version of the page name.
1.96 -
1.97 - pretty_pagename = EventAggregatorSupport.getPrettyPageName(event_page)
1.98 + event_summary = EventAggregatorSupport.getEventSummary(event_page, event_details)
1.99
1.100 output.append(fmt.listitem(on=1, attr={"class" : "event-listing"}))
1.101
1.102 - # Link to the page using the pretty name.
1.103 + # Link to the page using the summary.
1.104
1.105 - output.append(event_page.link_to_raw(request, wikiutil.escape(pretty_pagename)))
1.106 + output.append(event_page.link_to_raw(request, wikiutil.escape(event_summary)))
1.107
1.108 # Add the event details.
1.109