added yearly recurrence support

merged allday events and regular recurring events, see dev-email list for
details
alldays.ics is a test file that just has allday events

2 files changed, 92 insertions, 30 deletions

diff --git a/calendars/alldays.ics b/calendars/alldays.ics
new file mode 100644
index 0000000..3befac4
--- /dev/null
+++ b/calendars/alldays.ics
@@ -0,0 +1,53 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Apple Computer\, Inc//iCal 1.0//EN
+X-WR-CALNAME;VALUE=TEXT:testing 2
+X-WR-TIMEZONE;VALUE=TEXT:US/Central
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VEVENT
+SEQUENCE:8
+UID:CBEE83F3-D467-11D6-A297-0050E4E60429
+DTSTAMP:20020930T094830Z
+SUMMARY:Monthly\, every 2 months\, 1st\, 15th\, 20th
+RRULE:FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=1,15,20
+DTSTART;VALUE=DATE:20020915
+DTEND;VALUE=DATE:20020916
+END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:5
+UID:CBEE8B60-D467-11D6-A297-0050E4E60429
+DTSTAMP:20020930T094910Z
+SUMMARY:Weekly\, Mon\, Wed
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE
+DTSTART;VALUE=DATE:20020902
+DTEND;VALUE=DATE:20020903
+END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:8
+UID:CBEE9067-D467-11D6-A297-0050E4E60429
+DTSTAMP:20020930T095005Z
+SUMMARY:Weekly\, 3 days long\, Tue
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU
+DTSTART;VALUE=DATE:20020903
+DTEND;VALUE=DATE:20020906
+END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:8
+UID:CBEE9556-D467-11D6-A297-0050E4E60429
+DTSTAMP:20020930T112718Z
+SUMMARY:yearly sept\, july
+RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=7,9
+DTSTART;VALUE=DATE:20020907
+DTEND;VALUE=DATE:20020908
+END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:7
+UID:CBEE9A6D-D467-11D6-A297-0050E4E60429
+DTSTAMP:20020930T112830Z
+SUMMARY:yearly\, aug\, jan\, 3rd friday
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3FR;BYMONTH=1,8
+DTSTART;VALUE=DATE:20020818
+DTEND;VALUE=DATE:20020819
+END:VEVENT
+END:VCALENDAR
diff --git a/calendars/default.ics b/calendars/default.ics
index c3a7eba..a39010b 100644
--- a/calendars/default.ics
+++ b/calendars/default.ics
@@ -12,14 +12,14 @@ SUMMARY:New Event
 EXDATE;TZID=US/Central:20021212T080000
 EXDATE;TZID=US/Central:20030101T080000
 EXDATE;TZID=US/Central:20021219T080000
-UID:B89C7854-D106-11D6-846D-0050E4E60429
 DTSTART;TZID=US/Central:20021208T080000
+UID:54C82C7E-D456-11D6-A297-0050E4E60429
 DURATION:PT1H
 RRULE:FREQ=DAILY;INTERVAL=1
 END:VEVENT
 BEGIN:VEVENT
+UID:54C82C7E-D456-11D6-A297-0050E4E60429
 RECURRENCE-ID;TZID=US/Central:20021218T080000
-UID:B89C7854-D106-11D6-846D-0050E4E60429
 DTSTART;TZID=US/Central:20021218T080000
 DURATION:PT1H
 DESCRIPTION:this day is extra special
@@ -28,8 +28,8 @@ BEGIN:VEVENT
 RECURRENCE-ID;TZID=US/Central:20021230T080000
 DTSTAMP:20020919T034122Z
 SUMMARY:New Eventsweet
+UID:54C82C7E-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Central:20021230T080000
-UID:B89C7854-D106-11D6-846D-0050E4E60429
 DURATION:PT1H
 DESCRIPTION:whoo hoo
 BEGIN:VALARM
@@ -38,8 +38,8 @@ ACTION:DISPLAY
 DESCRIPTION:Event reminder
 END:VALARM
 BEGIN:VALARM
-ATTACH;VALUE=URI:Ping
 TRIGGER;VALUE=DURATION:-PT15M
+ATTACH;VALUE=URI:Ping
 ACTION:AUDIO
 END:VALARM
 END:VEVENT
@@ -47,25 +47,25 @@ BEGIN:VEVENT
 SEQUENCE:1
 DTSTAMP:20020919T041307Z
 SUMMARY:New Event
-UID:B89C8C02-D106-11D6-846D-0050E4E60429
+UID:54C83E68-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Central:20021215T094500
 DURATION:PT1H30M
 END:VEVENT
 BEGIN:VEVENT
-SEQUENCE:17
-DTSTAMP:20020921T122925Z
+SEQUENCE:29
+DTSTAMP:20020928T231141Z
 SUMMARY:New Event
+UID:54C843B6-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Central:20020915T090000
-UID:B89C910F-D106-11D6-846D-0050E4E60429
 DURATION:PT1H45M
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR,SA,SU
+RRULE:FREQ=DAILY;INTERVAL=1
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:5
 DTSTAMP:20020926T031348Z
 SUMMARY:New Event
+UID:54C848A4-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Central:20020922T113000
-UID:B89C95A4-D106-11D6-846D-0050E4E60429
 DURATION:PT1H
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1SU
 END:VEVENT
@@ -74,7 +74,7 @@ SEQUENCE:3
 DTSTAMP:20020926T031621Z
 SUMMARY:Stef in town
 DTEND;TZID=US/Pacific:20020822T200000
-UID:B89C9A8F-D106-11D6-846D-0050E4E60429
+UID:54C84D52-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Pacific:20020822T170000
 END:VEVENT
 BEGIN:VEVENT
@@ -83,16 +83,16 @@ DTSTAMP:20020926T031621Z
 SUMMARY:This is a space \n\n\nOption return and a really long line of 
  text that will be inserted into the  event text box. Let's all see what 
  really happens when iCals start being real.
-UID:B89C9F10-D106-11D6-846D-0050E4E60429
+UID:54C85294-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Pacific:20020918T121500
 DURATION:PT2H
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:3
-DTSTART;TZID=US/Pacific:20020919T120000
+UID:54C857FC-D456-11D6-A297-0050E4E60429
 DTSTAMP:20020926T031621Z
 SUMMARY:Recurring Monthly
-UID:B89CA392-D106-11D6-846D-0050E4E60429
+DTSTART;TZID=US/Pacific:20020919T120000
 DTEND;TZID=US/Pacific:20020919T133000
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=19
 END:VEVENT
@@ -100,8 +100,8 @@ BEGIN:VEVENT
 SEQUENCE:2
 DTSTAMP:20020926T031621Z
 SUMMARY:Recurring Weekly
+UID:54C85D3A-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Pacific:20020920T120000
-UID:B89CA818-D106-11D6-846D-0050E4E60429
 DURATION:PT1H30M
 RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR
 END:VEVENT
@@ -109,8 +109,8 @@ BEGIN:VEVENT
 SEQUENCE:3
 DTSTAMP:20020926T031621Z
 SUMMARY:Recurring Daily
+UID:54C86548-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Pacific:20020921T100000
-UID:B89CAC94-D106-11D6-846D-0050E4E60429
 DURATION:PT1H30M
 RRULE:FREQ=DAILY;INTERVAL=1
 END:VEVENT
@@ -118,33 +118,33 @@ BEGIN:VEVENT
 SEQUENCE:4
 DTSTAMP:20020926T031621Z
 SUMMARY:Monthly UNTIL 5 times
-UID:B89CB63D-D106-11D6-846D-0050E4E60429
 DTSTART;TZID=US/Pacific:20020919T140000
+UID:54C87022-D456-11D6-A297-0050E4E60429
 DURATION:PT1H30M
 RRULE:FREQ=MONTHLY;COUNT=5;INTERVAL=1;BYMONTHDAY=19
 END:VEVENT
 BEGIN:VEVENT
-SEQUENCE:11
-UID:B89CBB22-D106-11D6-846D-0050E4E60429
-DTSTAMP:20020926T031621Z
-SUMMARY:Monthly UNTiL date
+SEQUENCE:12
 DTSTART;TZID=US/Pacific:20020919T160000
+DTSTAMP:20020928T232448Z
+SUMMARY:Monthly UNTiL date
+UID:54C8757E-D456-11D6-A297-0050E4E60429
 DTEND;TZID=US/Pacific:20020919T180000
-RRULE:FREQ=MONTHLY;UNTIL=20021223T075959;INTERVAL=1;BYMONTHDAY=19
+RRULE:FREQ=MONTHLY;UNTIL=20021224T075959;INTERVAL=1;BYMONTHDAY=19
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:7
 DTSTAMP:20020926T031621Z
 SUMMARY:Every two weeks on certain days
-UID:B89CBFA4-D106-11D6-846D-0050E4E60429
-STATUS:CONFIRMED
 DTSTART;TZID=US/Pacific:20020920T150000
+STATUS:CONFIRMED
+UID:54C87AFE-D456-11D6-A297-0050E4E60429
 DURATION:PT1H30M
 RRULE:FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:5
-UID:B89CC43E-D106-11D6-846D-0050E4E60429
+UID:54C88006-D456-11D6-A297-0050E4E60429
 DTSTAMP:20020926T031621Z
 SUMMARY:Montly all day
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=19,20,21
@@ -153,7 +153,7 @@ DTEND;VALUE=DATE:20020920
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:3
-UID:B89CC8E4-D106-11D6-846D-0050E4E60429
+UID:54C88504-D456-11D6-A297-0050E4E60429
 DTSTAMP:20020926T031621Z
 SUMMARY:Yearly all day
 RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=9
@@ -164,7 +164,7 @@ BEGIN:VEVENT
 SEQUENCE:4
 DTSTAMP:20020926T031621Z
 RECURRENCE-ID;TZID=US/Pacific:20020923T100000
-UID:B89CAC94-D106-11D6-846D-0050E4E60429
+UID:54C86548-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Pacific:20020923T113000
 DURATION:PT1H30M
 END:VEVENT
@@ -174,14 +174,14 @@ DTSTAMP:20020926T031621Z
 SUMMARY:New Event
 DTEND;TZID=US/Pacific:20020923T133000
 DTSTART;TZID=US/Pacific:20020923T113000
-UID:B89CCD6D-D106-11D6-846D-0050E4E60429
+UID:54C889E0-D456-11D6-A297-0050E4E60429
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:9
 DTSTAMP:20020926T032430Z
 SUMMARY:Monthly\, specific days
+UID:54C88EDC-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Central:20020915T104500
-UID:B89CD2CF-D106-11D6-846D-0050E4E60429
 DURATION:PT1H
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=9,13,15,18,25,0
 END:VEVENT
@@ -189,9 +189,18 @@ BEGIN:VEVENT
 SEQUENCE:4
 DTSTAMP:20020926T032415Z
 SUMMARY:Monthly\, 2nd sunday
+UID:54C89436-D456-11D6-A297-0050E4E60429
 DTSTART;TZID=US/Central:20020915T123000
-UID:B89CD75F-D106-11D6-846D-0050E4E60429
 DURATION:PT1H15M
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=2SU
 END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:6
+UID:54C899A4-D456-11D6-A297-0050E4E60429
+DTSTAMP:20020930T092321Z
+SUMMARY:Monthly\, every 2 months\, 1st\, 10th\, 19th
+RRULE:FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=1,10,19
+DTSTART;VALUE=DATE:20020901
+DTEND;VALUE=DATE:20020902
+END:VEVENT
 END:VCALENDAR