Refactored the code and added support for FilterType

This commit is contained in:
Ludovic Marcotte committed 2014-01-20 10:13:16 -05:00
1 parent 07d4b2bae2
commit 046a645119
10 files changed
+263 -114

No files matched your search

+30 -2
View File
@@ -1101,6 +1101,7 @@ static NSArray *childRecordFields = nil;
//
- (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) properties
matchingSyncToken: (NSString *) syncToken
fromDate: (NSCalendarDate *) theStartDate
{
/* TODO:
- validation:
@@ -1124,8 +1125,20 @@ static NSArray *childRecordFields = nil;
if ([syncToken length])
{
syncTokenInt = [syncToken intValue];
qualifier = [EOQualifier qualifierWithQualifierFormat:
@"c_lastmodified > %d", syncTokenInt];
if (theStartDate)
{
EOQualifier *sinceDateQualifier = [EOQualifier qualifierWithQualifierFormat:
@"c_creationdate > %d", (int)[theStartDate timeIntervalSince1970]];
qualifier = [[EOAndQualifier alloc] initWithQualifiers: sinceDateQualifier, qualifier,
nil];
[qualifier autorelease];
}
mRecords = [NSMutableArray arrayWithArray: [self _fetchFields: fields
withQualifier: qualifier
ignoreDeleted: YES]];
@@ -1145,10 +1158,24 @@ static NSArray *childRecordFields = nil;
qualifier = [EOQualifier qualifierWithQualifierFormat: filter];
else
qualifier = nil;
records = [self _fetchFields: fields withQualifier: qualifier
if (theStartDate)
{
EOQualifier *sinceDateQualifier = [EOQualifier qualifierWithQualifierFormat:
@"c_creationdate > %d", (int)[theStartDate timeIntervalSince1970]];
qualifier = [[EOAndQualifier alloc] initWithQualifiers: sinceDateQualifier, qualifier,
nil];
[qualifier autorelease];
}
records = [self _fetchFields: fields
withQualifier: qualifier
ignoreDeleted: YES];
}
return records;
}
@@ -1407,7 +1434,8 @@ static NSArray *childRecordFields = nil;
firstElementWithTag: @"prop" inNamespace: XMLNS_WEBDAV];
properties = [self parseDAVRequestedProperties: propElement];
records = [self syncTokenFieldsWithProperties: properties
matchingSyncToken: syncToken];
matchingSyncToken: syncToken
fromDate: nil];
[self _appendComponentProperties: [properties allKeys]
fromRecords: records
matchingSyncToken: [syncToken intValue]