some cycle improvs

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1128 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog
index 1d1f3ae96404b07ef3b118c88bb151a2176eb55f..c64773b4a1798569a110daf559b58a0a24e02f9f 100644 (file)
--- a/sope-ical/NGiCal/ChangeLog
+++ b/sope-ical/NGiCal/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-22  Helge Hess  <helge.hess@skyrix.com>
+
+       * iCalRecurrenceRule.m: added direct parser support for 'interval',
+         allow 'until' values w/o Z marker for date-only values (v4.5.68)
+
 2005-09-22  Helge Hess  <helge.hess@opengroupware.org>
 
        * v4.5.67

diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version
index ead974b44c4f7c5ef6aff1ec7b8b6b8740870797..59e4f30b7c28035b49b0b0e7bd17efa62064029c 100644 (file)
--- a/sope-ical/NGiCal/Version
+++ b/sope-ical/NGiCal/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION=4
 MINOR_VERSION=5
-SUBMINOR_VERSION:=67
+SUBMINOR_VERSION:=68
 
 # v4.5.40 requires NGExtensions v4.5.145
 # v4.5.37 requires NGExtensions v4.5.140

diff --git a/sope-ical/NGiCal/iCalRecurrenceRule.m b/sope-ical/NGiCal/iCalRecurrenceRule.m
index a8aaec0449083c210a77a16f26f0e00aae5ea0e9..15f6e700e5fde11b7c45fc64280787c5fb236507 100644 (file)
--- a/sope-ical/NGiCal/iCalRecurrenceRule.m
+++ b/sope-ical/NGiCal/iCalRecurrenceRule.m
@@ -261,6 +261,7 @@
   NSString *pByday     = nil;
   NSString *pBymday    = nil;
   NSString *pBysetpos  = nil;
+  NSString *pInterval  = nil;
   
   props = [_rrule componentsSeparatedByString:@";"];
   for (i = 0, count = [props count]; i < count; i++) {
@@ -298,6 +299,9 @@
     case 'f':
       if ([key isEqualToString:@"freq"]) { vHolder = &pFrequency; break; }
       break;
+    case 'i':
+      if ([key isEqualToString:@"interval"]) { vHolder = &pInterval; break; }
+      break;
     case 'u':
       if ([key isEqualToString:@"until"]) { vHolder = &pUntil; break; }
       break;
@@ -328,6 +332,10 @@
     [self errorWithFormat:@"rrule contains no frequency: '%@'", _rrule];
   [pFrequency release]; pFrequency = nil;
   
+  if (pInterval != nil)
+    self->interval = [pInterval intValue];
+  [pInterval release]; pInterval = nil;
+  
   // TODO: we should parse byday in here
   if (pByday != nil) [self setByday:pByday];
   [pByday release]; pByday = nil;
@@ -360,7 +368,7 @@
          UTC time format."
       TODO: we still need some object representing a 'timeless' date.
     */
-    if (![pUntil hasSuffix:@"Z"]) {
+    if (![pUntil hasSuffix:@"Z"] && [pUntil length] > 8) {
       [self warnWithFormat:@"'until' date has no explicit UTC marker: '%@'",
               _rrule];
     }