Monotone-Parent: 8bae8ee0ffba06f4b31f504c8f6d8671827d1a97

Monotone-Revision: d6a619fbf875335523673d5bf683e34b3ac7887e

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-06-08T14:32:21
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -1382,7 +1382,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
         {
           maxStart = [self _getMaxStartDate];
           if (maxStart)
-	    [self _addDateRangeLimitToFilter: filterData];
+            [self _addDateRangeLimitToFilter: filterData];
         }
       [filterData setObject: [NSNumber numberWithBool: NO] forKey: @"iscycle"];
     }
@@ -1434,6 +1434,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   NSMutableDictionary *rc;
 
   rc = [NSMutableDictionary dictionaryWithDictionary: filter];
+  [rc setObject: [rc objectForKey: @"start"] forKey: @"cycleenddate"];
   [rc removeObjectForKey: @"start"];
   [rc removeObjectForKey: @"end"];
   [rc setObject: sharedYes forKey: @"iscycle"];
@@ -1496,6 +1497,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   static NSArray *fields = nil;
   NSMutableArray *filters;
   NSNumber *cycle;
+  NSCalendarDate *cEndDate;
 
 #warning the list of fields should be taken from the .ocs description file
   if (!fields)
@@ -1525,6 +1527,14 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
       filterString = [NSString stringWithFormat: @"(c_iscycle = '%d')", 
 			       [cycle intValue]];
       [filters addObject: filterString];
+
+      if ([cycle intValue])
+        {
+          cEndDate = [filter objectForKey: @"cycleenddate"];
+          filterString = [NSString stringWithFormat: @"(c_cycleenddate >= %u)",
+                          (unsigned int) [cEndDate timeIntervalSince1970]];
+          [filters addObject: filterString];
+        }
     }
 
   if ([filters count])