74f525428b
The parent with single detached recurrence was too simplistic. More than one detached recurrence is necessary to trigger a problem in the EDS calendar backend. Because the "parent + single detached recurrence" may also be a relevant special case, it is also still covered. Finally, importing multiple detached recurrences without parent also needs to be covered. Missing is importing of a single detached recurrence. This should be covered by importing the first of the two detached recurrences.
149 lines
3.8 KiB
Diff
149 lines
3.8 KiB
Diff
@@ -1,32 +1,12 @@
|
|
BEGIN:VCALENDAR
|
|
PRODID:-//Ximian//NONSGML Evolution Calendar//EN
|
|
VERSION:2.0
|
|
-BEGIN:VTIMEZONE
|
|
-TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
|
|
-X-LIC-LOCATION:Europe/Berlin
|
|
-BEGIN:DAYLIGHT
|
|
-TZOFFSETFROM:+0100
|
|
-TZOFFSETTO:+0200
|
|
-TZNAME:CEST
|
|
-DTSTART:19700329T020000
|
|
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
|
|
-END:DAYLIGHT
|
|
-BEGIN:STANDARD
|
|
-TZOFFSETFROM:+0200
|
|
-TZOFFSETTO:+0100
|
|
-TZNAME:CET
|
|
-DTSTART:19701025T030000
|
|
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
|
|
-END:STANDARD
|
|
-END:VTIMEZONE
|
|
BEGIN:VEVENT
|
|
SUMMARY:phone meeting
|
|
DESCRIPTION:let's talk
|
|
CATEGORIES:MEETING
|
|
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
|
|
- 20060406T163000
|
|
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
|
|
- 20060406T160000
|
|
+DTEND:20060406T143000Z
|
|
+DTSTART:20060406T140000Z
|
|
UID:20060406T211449Z-4562-727-1-63@gollum
|
|
DTSTAMP:20060406T211449Z
|
|
LAST-MODIFIED:20060416T203532Z
|
|
@@ -90,59 +70,7 @@
|
|
CLASS:PUBLIC
|
|
CREATED:20060416T203924Z
|
|
LAST-MODIFIED:20060416T203949Z
|
|
-RRULE:FREQ=MONTHLY;INTERVAL=1;UNTIL=20060606T173000Z
|
|
-END:VEVENT
|
|
-END:VCALENDAR
|
|
-
|
|
-BEGIN:VCALENDAR
|
|
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
|
|
-VERSION:2.0
|
|
-BEGIN:VEVENT
|
|
-UID:20060416T203954Z-4272-727-1-243@gollum
|
|
-DTSTAMP:20060416T203954Z
|
|
-DTSTART:20060406T180000Z
|
|
-DTEND:20060406T183000Z
|
|
-TRANSP:OPAQUE
|
|
-SEQUENCE:2
|
|
-SUMMARY:recurrence\, yearly\, two times
|
|
-CLASS:PUBLIC
|
|
-RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20070406T180000Z
|
|
-CREATED:20060416T204021Z
|
|
-LAST-MODIFIED:20060416T204021Z
|
|
-END:VEVENT
|
|
-END:VCALENDAR
|
|
-
|
|
-BEGIN:VCALENDAR
|
|
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
|
|
-VERSION:2.0
|
|
-BEGIN:VEVENT
|
|
-UID:20060416T204026Z-4272-727-1-244@gollum
|
|
-DTSTAMP:20060416T204026Z
|
|
-DTSTART;VALUE=DATE:20060406
|
|
-DTEND;VALUE=DATE:20060407
|
|
-TRANSP:TRANSPARENT
|
|
-SEQUENCE:2
|
|
-SUMMARY:all day event
|
|
-CLASS:PUBLIC
|
|
-CREATED:20060416T204042Z
|
|
-LAST-MODIFIED:20060416T204042Z
|
|
-END:VEVENT
|
|
-END:VCALENDAR
|
|
-
|
|
-BEGIN:VCALENDAR
|
|
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
|
|
-VERSION:2.0
|
|
-BEGIN:VEVENT
|
|
-UID:20060416T204047Z-4272-727-1-245@gollum
|
|
-DTSTAMP:20060416T204047Z
|
|
-DTSTART;VALUE=DATE:20060406
|
|
-DTEND;VALUE=DATE:20060408
|
|
-TRANSP:TRANSPARENT
|
|
-SEQUENCE:2
|
|
-SUMMARY:two day event
|
|
-CLASS:PUBLIC
|
|
-CREATED:20060416T204104Z
|
|
-LAST-MODIFIED:20060416T204104Z
|
|
+RRULE:FREQ=MONTHLY;BYMONTHDAY=6;INTERVAL=1;UNTIL=20060606T173000Z
|
|
END:VEVENT
|
|
END:VCALENDAR
|
|
|
|
@@ -161,8 +89,6 @@
|
|
Saturday
|
|
CLASS:PUBLIC
|
|
RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20060412T183000Z
|
|
-EXDATE;VALUE=DATE:20060408
|
|
-EXDATE;VALUE=DATE:20060407
|
|
CREATED:20060416T204808Z
|
|
LAST-MODIFIED:20060416T204808Z
|
|
END:VEVENT
|
|
@@ -193,12 +119,6 @@
|
|
^\npercent %\ntilde ~\ntick `\nbacktick `\ndouble quotation - not tested
|
|
because Evolution encodes it incorrectly\nsingle quotation '\ncolon :\n
|
|
semicolon \;\ncomma \,\n
|
|
-BEGIN:VALARM
|
|
-X-EVOLUTION-ALARM-UID:20060416T204833Z-4250-727-1-85@gollum
|
|
-ACTION:DISPLAY
|
|
-DESCRIPTION:This is an event reminder
|
|
-TRIGGER;VALUE=DURATION;RELATED=START:-PT1H
|
|
-END:VALARM
|
|
END:VEVENT
|
|
END:VCALENDAR
|
|
|
|
@@ -361,28 +281,11 @@
|
|
BEGIN:VCALENDAR
|
|
PRODID:-//Ximian//NONSGML Evolution Calendar//EN
|
|
VERSION:2.0
|
|
-BEGIN:VTIMEZONE
|
|
-TZID:EST/EDT
|
|
-BEGIN:STANDARD
|
|
-TZOFFSETFROM:-0400
|
|
-TZOFFSETTO:-0500
|
|
-TZNAME:EST
|
|
-DTSTART:19671029T020000
|
|
-RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=-1SU
|
|
-END:STANDARD
|
|
-BEGIN:DAYLIGHT
|
|
-TZOFFSETFROM:-0500
|
|
-TZOFFSETTO:-0400
|
|
-TZNAME:EDT
|
|
-DTSTART:19870405T020000
|
|
-RRULE:FREQ=MONTHLY;INTERVAL=12;BYDAY=1SU
|
|
-END:DAYLIGHT
|
|
-END:VTIMEZONE
|
|
BEGIN:VEVENT
|
|
UID:20060416T205224Z-4272-727-1-251@gollum
|
|
DTSTAMP:20060416T205224Z
|
|
-DTSTART;TZID=EST/EDT:20060406T140000
|
|
-DTEND;TZID=EST/EDT:20060406T143000
|
|
+DTSTART:20060406T180000Z
|
|
+DTEND:20060406T183000Z
|
|
TRANSP:OPAQUE
|
|
SEQUENCE:2
|
|
SUMMARY:timezone New York with custom definition for 2006
|