X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sope-ical%2FNGiCal%2FNGiCal.xmap;h=182db0bb7c449127ffc7938c8a240216a090a574;hb=44a8a29f4a941d3eacfb4c115717da7ba36f520d;hp=1473190c26de97e65550c96f9719a42d2930ca1c;hpb=0845f165ed702b7887d2a57ee8e8a87b658b1235;p=sope

diff --git a/sope-ical/NGiCal/NGiCal.xmap b/sope-ical/NGiCal/NGiCal.xmap
index 1473190c..182db0bb 100644
--- a/sope-ical/NGiCal/NGiCal.xmap
+++ b/sope-ical/NGiCal/NGiCal.xmap
@@ -8,7 +8,7 @@
       tagKey = "tag";
       
       ToManyRelationships = {
-	"subcomponents" = ( vcalendar );
+        "subcomponents" = ( vcalendar );
       };
     };
     
@@ -19,44 +19,58 @@
         prodid   = prodId;
         version  = version;
         calscale = calscale;
+	method   = method;
       };
       
       ToManyRelationships = {
-	events    = ( vevent    );
-	todos     = ( vtodo     );
-	journals  = ( journals  );
-	freeBusys = ( vfreebusy );
-	timezones = ( vtimezone );
+        events    = ( vevent    );
+        todos     = ( vtodo     );
+        journals  = ( journals  );
+        freeBusys = ( vfreebusy );
+        timezones = ( vtimezone );
       };
     };
     
     vevent = {
       class  = iCalEvent;
-      
+
+      attributes = {
+      };
+
       ToManyRelationships = {
-	"alarms"    = ( valarm   );
-	"attendees" = ( attendee );
+        "alarms"          = ( valarm   );
+        "attendees"       = ( attendee );
+        "recurrenceRules" = ( rrule    );
+        "exceptionRules"  = ( exrule   );
+        "exceptionDates"  = ( exdate   );
       };
     };
     
     vtodo = {
       class = "iCalToDo";
-      
+
+      attributes = {
+      };
+
       ToManyRelationships = {
-	"alarms"    = ( valarm   );
-	"attendees" = ( attendee );
+        "alarms"    = ( valarm   );
+        "attendees" = ( attendee );
       };
     };
     
     valarm = {
       class = "iCalAlarm";
+
+      attributes = {
+        rrule = recurrenceRule;
+      };
     };
     
     vfreebusy = {
       class = "iCalFreeBusy";
       
       ToManyRelationships = {
-	"entries" = ( freebusy );
+        "entries" = ( freebusy );
       };
     };
     
@@ -64,7 +78,7 @@
       class = NSMutableDictionary;
       
       attributes = {
-	tzid             = timeZoneID;
+        tzid             = timeZoneID;
         "X-LIC-LOCATION" = location;
         daylight         = daylightInfo;
         standard         = standardInfo;
@@ -74,22 +88,22 @@
       class = NSMutableDictionary;
       
       attributes = {
-	tzoffsetfrom = tzOffsetFrom;
-	tzoffsetto   = tzOffsetTo;
-	tzname       = tzName;
-	dtstart      = startDate;
-	rrule        = recurrenceRule;
+        tzoffsetfrom = tzOffsetFrom;
+        tzoffsetto   = tzOffsetTo;
+        tzname       = tzName;
+        dtstart      = startDate;
+        rrule        = recurrenceRule;
       };
     };
     standard = {
       class = NSMutableDictionary;
       
       attributes = {
-	tzoffsetfrom = tzOffsetFrom;
-	tzoffsetto   = tzOffsetTo;
-	tzname       = tzName;
-	dtstart      = startDate;
-	rrule        = recurrenceRule;
+        tzoffsetfrom = tzOffsetFrom;
+        tzoffsetto   = tzOffsetTo;
+        tzname       = tzName;
+        dtstart      = startDate;
+        rrule        = recurrenceRule;
       };
     };
     
@@ -132,6 +146,15 @@
       tagKey     = "tag";
       contentKey = "string";
     };
+    exdate = {
+      class = iCalDateHolder;
+      key   = "recurrenceRuleExceptionDate";
+      attributes = {
+        tzid = tzid;
+      };
+      tagKey     = "tag";
+      contentKey = "string";
+    };
     due = {
       class = iCalDateHolder;
       attributes = {
@@ -155,11 +178,12 @@
     
     summary     = { class = NSString; };
     description = { class = NSString; key = comment; };
+    comment     = { class = NSString; key = userComment; };
     uid         = { class = NSString; };
     action      = { class = NSString; };
     priority    = { class = NSString; };
     status      = { class = NSString; };
-    transp      = { class = NSString; };
+    transp      = { class = NSString; key = transparency; };
     sequence    = { class = NSString; };
     categories  = { class = NSString; };
     class       = { class = NSString; key = accessClass; };
@@ -218,7 +242,27 @@
       class = NSString;
     };
     rrule = {
-      class = NSString;
+      class = iCalRecurrenceRule;
+      /*
+      attributes = {
+        freq       = rrFreq;
+        until      = rrUntil;
+        count      = rrCount;
+        interval   = rrInterval;
+        bysecond   = rrBySecondList;
+        byminute   = rrByMinuteList;
+        byhour     = rrByHourList;
+        byday      = rrByDayList;
+        bymonthday = rrByMonthDayList;
+        byyearday  = rrByYearDayList;
+        byweekno   = rrByWeekNumberList;
+        bymonth    = rrByMonthList;
+        bysetpos   = rrBySetPosList;
+        wkst       = rrWeekStart;
+      };
+      */
+      contentKey = "rrule";
+      key        = "recurrenceRule";
     };
     location = {
       class = NSString;