From 1802fe1e63164bae9f02ae0153f98d952630b741 Mon Sep 17 00:00:00 2001 From: C Robert Date: Tue, 2 Jun 2009 14:39:21 +0000 Subject: [PATCH] Fixed incoherence Monotone-Parent: e88954c069bb059beab0f156e13851671bd1054a Monotone-Revision: 2e82af935f99a50853aa4b3dfee4ab97d8f9fc66 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-06-02T14:39:21 Monotone-Branch: ca.inverse.sogo --- .../Appointments/SOGoAppointmentFolder.m | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 3c4d1f3c7..3a6aeeaf3 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -901,8 +901,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir title: (NSString *) title component: (id) _component additionalFilters: (NSString *) filters - includeProtectedInformation: (BOOL) _includeProtectedInformation; - + includeProtectedInformation: (BOOL) _includeProtectedInformation { EOQualifier *qualifier; GCSFolder *folder; @@ -1306,6 +1305,20 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir [self _enforceTimeLimitOnFilter: filter]; } +- (void) _addDateRangeLimitToFilter: (NSMutableDictionary *) filter +{ + NSCalendarDate *now; + int limit; + + now = [NSCalendarDate date]; + limit = [self _getStartTimeLimit]; + + [filter setObject: [now addTimeInterval: (limit / 2) * -86400] + forKey: @"start"]; + [filter setObject: [now addTimeInterval: (limit / 2) * 86400] + forKey: @"end"]; +} + #warning This method lacks support for timeranges - (void) _appendPropertyFilter: (id ) propFilter toFilter: (NSMutableDictionary *) filter @@ -1359,10 +1372,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir maxStart = [self _getMaxStartDate]; if (maxStart) { - [filterData setObject: maxStart - forKey: @"start"]; - [filterData setObject: [NSCalendarDate distantFuture] - forKey: @"end"]; + [self _addDateRangeLimitToFilter: filterData]; } } }