amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-09 02:15:08 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: c7fbb37f86d4d228354053447bb000451c74730a

Browse Source 
Monotone-Revision: a1fec97888a28b21f11c4743a65a09fe028bf771

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-07T20:57:00
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-07-07 20:57:00 +00:00
parent 7acad8f8f9
commit 5659a3b1cf
2 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2009-07-07 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-additionalWebdavSyncFilters): overriden method for returning a
clause that takes the DAV time limit into account.
* SoObjects/SOGo/SOGoGCSFolder.m (-davSyncCollection:): added the
ability to specify additional filters for elements that must be
returned.
SoObjects/Appointments/SOGoAppointmentFolder.m
+47 -33
View File
@@ -80,12 +80,14 @@
static NGLogger *logger = nil;
static NSNumber *sharedYes = nil;
static int davCalendarStartTimeLimit = 0;
+ (void) initialize
{
NGLoggerManager *lm;
static BOOL didInit = NO;
static BOOL didInit = NO;
NSUserDefaults *ud;
if (!didInit)
{
didInit = YES;
@@ -100,6 +102,10 @@ static NSNumber *sharedYes = nil;
logger = [lm loggerForDefaultKey: @"SOGoAppointmentFolderDebugEnabled"];
sharedYes = [[NSNumber numberWithBool: YES] retain];
ud = [NSUserDefaults standardUserDefaults];
davCalendarStartTimeLimit
= [ud integerForKey: @"SOGoDAVCalendarStartTimeLimit"];
}
}
@@ -1219,28 +1225,17 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
[r appendString: @"</D:href><D:status>HTTP/1.1 404 Not Found</D:status></D:response>"];
}
- (int) _getStartTimeLimit
{
NSUserDefaults *ud;
int interval;
ud = [NSUserDefaults standardUserDefaults];
interval = [ud integerForKey: @"SOGoDAVCalendarStartTimeLimit"];
return interval;
}
- (NSCalendarDate *) _getMaxStartDate
{
NSCalendarDate *tmp, *rc = NULL;
int interval;
interval = [self _getStartTimeLimit];
if (interval > 0)
NSCalendarDate *tmp, *rc;
if (davCalendarStartTimeLimit > 0)
{
tmp = [NSCalendarDate date];
rc = [tmp addTimeInterval: interval * -86400];
rc = [tmp addTimeInterval: davCalendarStartTimeLimit * -86400];
}
else
rc = nil;
return rc;
}
@@ -1248,40 +1243,39 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
- (void) _enforceTimeLimitOnFilter: (NSMutableDictionary *) filter
{
NSCalendarDate *start, *end, *now;
int limit, interval, intervalStart, intervalEnd;
int interval, intervalStart, intervalEnd;
start = [filter objectForKey: @"start"];
end = [filter objectForKey: @"end"];
now = [NSCalendarDate date];
limit = [self _getStartTimeLimit];
interval = ([end timeIntervalSinceDate: start] / 86400);
if (limit > 0 && interval > limit)
if (davCalendarStartTimeLimit > 0 && interval > davCalendarStartTimeLimit)
{
if ([now compare: start] == NSOrderedDescending
&& [now compare: end] == NSOrderedAscending)
{
intervalStart = [now timeIntervalSinceDate: start] / 86400;
intervalEnd = [end timeIntervalSinceDate: now] / 86400;
if (intervalStart > limit / 2)
if (intervalStart > davCalendarStartTimeLimit / 2)
{
start = [now addTimeInterval: (limit / 2) * -86400];
start = [now addTimeInterval: (davCalendarStartTimeLimit / 2) * -86400];
[filter setObject: start forKey: @"start"];
}
if (intervalEnd > limit / 2)
if (intervalEnd > davCalendarStartTimeLimit / 2)
{
end = [now addTimeInterval: (limit / 2) * 86400];
end = [now addTimeInterval: (davCalendarStartTimeLimit / 2) * 86400];
[filter setObject: end forKey: @"end"];
}
}
else if ([now compare: end] == NSOrderedDescending)
{
start = [end addTimeInterval: limit * -86400];
start = [end addTimeInterval: davCalendarStartTimeLimit * -86400];
[filter setObject: start forKey: @"start"];
}
else if ([now compare: start] == NSOrderedAscending)
{
end = [start addTimeInterval: limit * 86400];
end = [start addTimeInterval: davCalendarStartTimeLimit * 86400];
[filter setObject: end forKey: @"end"];
}
}
@@ -1307,14 +1301,13 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
- (void) _addDateRangeLimitToFilter: (NSMutableDictionary *) filter
{
NSCalendarDate *now;
int limit;
NSTimeInterval rangeLimit;
now = [NSCalendarDate date];
limit = [self _getStartTimeLimit];
[filter setObject: [now addTimeInterval: (limit / 2) * -86400]
rangeLimit = (davCalendarStartTimeLimit / 2) * -86400;
[filter setObject: [now addTimeInterval: rangeLimit]
forKey: @"start"];
[filter setObject: [now addTimeInterval: (limit / 2) * 86400]
[filter setObject: [now addTimeInterval: rangeLimit * -1]
forKey: @"end"];
}
@@ -1882,6 +1875,27 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
return r;
}
- (NSString *) additionalWebdavSyncFilters
{
NSCalendarDate *startDate;
NSString *filter;
int startDateSecs;
startDate = [self _getMaxStartDate];
if (startDate)
{
startDateSecs = (int) [startDate timeIntervalSince1970];
filter = [NSString stringWithFormat: @"c_enddate = NULL"
@" OR (c_enddate >= %d AND c_iscycle = 0)"
@" OR (c_cycleenddate >= %d AND c_iscycle = 1)",
startDateSecs, startDateSecs];
}
else
filter = @"";
return filter;
}
- (Class) objectClassForContent: (NSString *) content
{
iCalCalendar *calendar;