See ChangeLog

Monotone-Parent: ca2ee94c72bc7929077ce2d18873be1f59a198d9
Monotone-Revision: 55a3e83df8d5652ae3ebeec99432c0ae7f1e8c29

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-10-07T19:11:01
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-10-07 19:11:01 +00:00
parent 04b94ea130
commit 59a851ccd0
3 changed files with 25 additions and 32 deletions
+9 -19
View File
@@ -35,7 +35,7 @@
@implementation EOQualifier (SOGoMailDAVExtension)
+ (EOQualifier *) buildQualifierFromFilters: (DOMElement *) mailFilters
+ (id) qualifierFromMailDAVMailFilters: (DOMElement *) mailFilters
{
NSMutableArray *args, *formats;
NSArray *flags, *strings, *dates;
@@ -79,13 +79,13 @@
if (endDate && [startDate isEqual: endDate])
{
[formats addObject: [NSString stringWithFormat:
@"(%@ = %%@", tagName]];
@"%@ = %%@", tagName]];
datesAreEqual = YES;
}
else
{
[formats addObject: [NSString stringWithFormat:
@"(%@ > %%@", tagName]];
@"%@ > %%@", tagName]];
datesAreEqual = NO;
}
[args addObject: startDate];
@@ -93,7 +93,7 @@
if (endDate && !datesAreEqual)
{
[formats addObject: [NSString stringWithFormat:
@"(%@ < %%@", tagName]];
@"%@ < %%@", tagName]];
[args addObject: endDate];
}
}
@@ -112,7 +112,7 @@
if (!valueB)
valueB = @"*";
[formats addObject: @"(uid = %@)"];
[formats addObject: @"uid = %@"];
[args addObject: [NSString stringWithFormat: @"%@:%@",
valueA, valueB]];
}
@@ -122,20 +122,20 @@
valueA = [current attribute: @"min"];
if (valueA)
{
[formats addObject: @"(size > %@)"];
[formats addObject: @"size > %@"];
[args addObject: valueA];
}
valueA = [current attribute: @"max"];
if (valueA)
{
[formats addObject: @"(size < %@)"];
[formats addObject: @"size < %@"];
[args addObject: valueA];
}
}
// All flags
else if ([flags containsObject: tagName])
{
[formats addObject: @"(flags doesContain: %@)"];
[formats addObject: @"flags doesContain: %@"];
[args addObject: tagName];
}
// All strings
@@ -145,7 +145,7 @@
if (valueA)
{
format = [NSString stringWithFormat:
@"(%@ doesContain: %%@)", tagName];
@"%@ doesContain: %%@", tagName];
[formats addObject: format];
[args addObject: valueA];
}
@@ -159,14 +159,4 @@
arguments: args];
}
+ (id) qualifierFromMailDAVMailFilters: (DOMElement *) mailFilters
{
EOQualifier *newQualifier;
newQualifier = [EOQualifier buildQualifierFromFilters: mailFilters];
return newQualifier;
}
@end