LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

(feat) we now also search on the send for EAS Search ops

Browse source
This commit is contained in:
Ludovic Marcotte 2016-11-03 13:50:03 -04:00
parent 21dd03eb81
commit 70b3ff4b5c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ActiveSync/SOGoActiveSyncDispatcher.m
View file

@ -2848,7 +2848,7 @@ void handle_eas_terminate(int signum)
andElement = [(id)[theDocumentElement getElementsByTagName: @"And"] lastObject]; andElement = [(id)[theDocumentElement getElementsByTagName: @"And"] lastObject];
if (andElement) if (andElement)
{ {
EOQualifier *qualifier, *fetchQualifier, *notDeleted, *greaterThanQualifier; EOQualifier *subjectQualifier, *senderQualifier, *fetchQualifier, *notDeleted, *greaterThanQualifier, *orQualifier;
NSString *query; NSString *query;
id o; id o;
@ -2870,8 +2870,12 @@ void handle_eas_terminate(int signum)
} }
notDeleted = [EOQualifier qualifierWithQualifierFormat: @"(not (flags = %@))", @"deleted"]; notDeleted = [EOQualifier qualifierWithQualifierFormat: @"(not (flags = %@))", @"deleted"];
qualifier = [EOQualifier qualifierWithQualifierFormat: [NSString stringWithFormat: @"(%@ doesContain: '%@')", @"subject", query]]; subjectQualifier = [EOQualifier qualifierWithQualifierFormat: [NSString stringWithFormat: @"(%@ doesContain: '%@')", @"subject", query]];
fetchQualifier = [[EOAndQualifier alloc] initWithQualifiers: notDeleted, qualifier, greaterThanQualifier, nil]; senderQualifier = [EOQualifier qualifierWithQualifierFormat: [NSString stringWithFormat: @"(%@ doesContain: '%@')", @"from", query]];
orQualifier = [[EOOrQualifier alloc] initWithQualifiers: subjectQualifier, senderQualifier, nil];
fetchQualifier = [[EOAndQualifier alloc] initWithQualifiers: notDeleted, orQualifier, greaterThanQualifier, nil];
return [fetchQualifier autorelease]; return [fetchQualifier autorelease];
} }