amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-06 03:55:26 +00:00
Code Issues Projects Releases Wiki Activity

Added extra fields and NOT

Browse Source 
Monotone-Parent: 778b3664ce06bfae56a07b260fb9b9a241276d08
Monotone-Revision: dd01e619d1a581329304197499bcc223888f4535

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-10-05T21:14:44
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-10-05 21:14:44 +00:00
parent 5a357311c6
commit 290d0e76d5
2 changed files with 103 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -6,6 +6,7 @@
qualifiers from DAV filters. (REPORT)
* SoObjects/Mailer/EOQualifier+MailDAV.m: Formatted dates using
([NSCalendarDate rfc822DateString]).
* SoObjects/Mailer/EOQualifier+MailDAV.m: Added NOT and extra fields.
2009-10-04 Ludovic Marcotte <lmarcotte@inverse.ca>
SoObjects/Mailer/EOQualifier+MailDAV.m
+102 -17
View File
@@ -42,11 +42,14 @@
id <DOMNodeList> list;
DOMElement *current;
NSCalendarDate *startDate, *endDate;
int count, max;
int count, max, intValue;
NSString *negate;
qualifiers = [NSMutableArray array];
qual = nil;
#warning Qualifiers may be invalid, need to be tested
list = [mailFilters childNodes];
if (list)
{
@@ -56,6 +59,12 @@
current = [list objectAtIndex: count];
if ([current nodeType] == DOM_ELEMENT_NODE)
{
// Negate condition
if ([current attribute: @"not"])
negate = @"NOT ";
else
negate = @"";
// Received date
if ([[current tagName] isEqualToString: @"receive-date"])
{
@@ -63,16 +72,16 @@
endDate = [[current attribute: @"to"] asCalendarDate];
if (startDate && [startDate isEqual: endDate])
[qualifiers addObject:
[NSString stringWithFormat: @"(on = '%@')",
[startDate rfc822DateString]]];
[NSString stringWithFormat: @"%@(on = '%@')",
negate, [startDate rfc822DateString]]];
else if (startDate)
[qualifiers addObject:
[NSString stringWithFormat: @"(since > '%@')",
[startDate rfc822DateString]]];
[NSString stringWithFormat: @"%@(since > '%@')",
negate, [startDate rfc822DateString]]];
if (endDate)
[qualifiers addObject:
[NSString stringWithFormat: @"(before < '%@')",
[endDate rfc822DateString]]];
[NSString stringWithFormat: @"%@(before < '%@')",
negate, [endDate rfc822DateString]]];
}
// Sent date
else if ([[current tagName] isEqualToString: @"date"])
@@ -81,16 +90,16 @@
endDate = [[current attribute: @"to"] asCalendarDate];
if (startDate && [startDate isEqual: endDate])
[qualifiers addObject:
[NSString stringWithFormat: @"(senton = '%@')",
[startDate rfc822DateString]]];
[NSString stringWithFormat: @"%@(senton = '%@')",
negate, [startDate rfc822DateString]]];
else if (startDate)
[qualifiers addObject:
[NSString stringWithFormat: @"(sentsince > '%@')",
[startDate rfc822DateString]]];
[NSString stringWithFormat: @"%@(sentsince > '%@')",
negate, [startDate rfc822DateString]]];
if (endDate)
[qualifiers addObject:
[NSString stringWithFormat: @"(sentbefore < '%@')",
[endDate rfc822DateString]]];
[NSString stringWithFormat: @"%@(sentbefore < '%@')",
negate, [endDate rfc822DateString]]];
}
// Sequence
else if ([[current tagName] isEqualToString: @"sequence"])
@@ -103,7 +112,8 @@
buffer = [current attribute: @"uid"];
if (buffer)
[qualifiers addObject:
[NSString stringWithFormat: @"(uid = '%@')", buffer]];
[NSString stringWithFormat: @"%@(uid = '%@')",
negate, buffer]];
}
// From
else if ([[current tagName] isEqualToString: @"from"])
@@ -111,7 +121,8 @@
buffer = [current attribute: @"from"];
if (buffer)
[qualifiers addObject:
[NSString stringWithFormat: @"(from = '%@')", buffer]];
[NSString stringWithFormat: @"%@(from doesContain: '%@')",
negate, buffer]];
}
// To
else if ([[current tagName] isEqualToString: @"to"])
@@ -119,9 +130,83 @@
buffer = [current attribute: @"to"];
if (buffer)
[qualifiers addObject:
[NSString stringWithFormat: @"(to = '%@')", buffer]];
[NSString stringWithFormat: @"%@(to doesContain: '%@')",
negate, buffer]];
}
// Size
else if ([[current tagName] isEqualToString: @"size"])
{
intValue = [[current attribute: @"min"] intValue];
[qualifiers addObject:
[NSString stringWithFormat: @"%@(larger > '%d')",
negate, intValue]];
intValue = [[current attribute: @"max"] intValue];
if (intValue)
[qualifiers addObject:
[NSString stringWithFormat: @"%@(smaller < '%d')",
negate, intValue]];
}
// Answered
else if ([[current tagName] isEqualToString: @"answered"])
{
intValue = [[current attribute: @"answered"] intValue];
if (intValue)
[qualifiers addObject: [NSString stringWithFormat:
@"%@(answered)", negate]];
intValue = [[current attribute: @"unanswered"] intValue];
if (intValue)
[qualifiers addObject: [NSString stringWithFormat:
@"%@(unanswered)", negate]];
}
// Draft
else if ([[current tagName] isEqualToString: @"draft"])
{
intValue = [[current attribute: @"draft"] intValue];
if (intValue)
[qualifiers addObject: [NSString stringWithFormat:
@"%@(draft)", negate]];
}
// Flagged
else if ([[current tagName] isEqualToString: @"flagged"])
{
intValue = [[current attribute: @"flagged"] intValue];
if (intValue)
[qualifiers addObject: [NSString stringWithFormat:
@"%@(flagged)", negate]];
}
// Recent
else if ([[current tagName] isEqualToString: @"recent"])
{
intValue = [[current attribute: @"recent"] intValue];
if (intValue)
[qualifiers addObject: [NSString stringWithFormat:
@"%@(recent)", negate]];
}
// Seen
else if ([[current tagName] isEqualToString: @"seen"])
{
intValue = [[current attribute: @"seen"] intValue];
if (intValue)
[qualifiers addObject: [NSString stringWithFormat:
@"%@(seen)", negate]];
}
// Deleted
else if ([[current tagName] isEqualToString: @"deleted"])
{
intValue = [[current attribute: @"deleted"] intValue];
if (intValue)
[qualifiers addObject: [NSString stringWithFormat:
@"%@(deleted)", negate]];
}
// Keywords
else if ([[current tagName] isEqualToString: @"keywords"])
{
buffer = [current attribute: @"keywords"];
if (buffer)
[qualifiers addObject:
[NSString stringWithFormat: @"%@(keywords doesContain: '%@')",
negate, buffer]];
}
}
}
}