(fix) compiler fixes + first round of iOS fixes
parent
8bbfc4155b
commit
a9c29c65b3
|
@ -267,8 +267,6 @@ void handle_eas_terminate(int signum)
|
|||
return theIdToTranslate;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//
|
||||
//
|
||||
//
|
||||
|
@ -2804,17 +2802,17 @@ void handle_eas_terminate(int signum)
|
|||
|
||||
- (EOQualifier *) _qualifierFromMailboxSearchQuery: (id <DOMElement>) theDocumentElement
|
||||
{
|
||||
id <DOMElement> *andElement, *freeTextElement, *greaterThanElement;
|
||||
id <DOMElement> andElement, freeTextElement, greaterThanElement;
|
||||
|
||||
andElement = [[theDocumentElement getElementsByTagName: @"And"] lastObject];
|
||||
andElement = [(id)[theDocumentElement getElementsByTagName: @"And"] lastObject];
|
||||
if (andElement)
|
||||
{
|
||||
EOQualifier *qualifier, *fetchQualifier, *notDeleted, *greaterThanQualifier;
|
||||
NSString *query;
|
||||
id o;
|
||||
|
||||
freeTextElement = [[andElement getElementsByTagName: @"FreeText"] lastObject];
|
||||
query = [freeTextElement textValue];
|
||||
freeTextElement = [(id)[andElement getElementsByTagName: @"FreeText"] lastObject];
|
||||
query = [(id)freeTextElement textValue];
|
||||
greaterThanQualifier = nil;
|
||||
|
||||
if (!query)
|
||||
|
@ -2822,10 +2820,10 @@ void handle_eas_terminate(int signum)
|
|||
|
||||
// We check for the date ranges - we only support the GreaterThan since
|
||||
// the IMAP protocol is limited in this regard
|
||||
greaterThanElement = [[andElement getElementsByTagName: @"GreaterThan"] lastObject];
|
||||
if (greaterThanElement && [[greaterThanElement getElementsByTagName: @"DateReceived"] lastObject])
|
||||
greaterThanElement = [(id)[andElement getElementsByTagName: @"GreaterThan"] lastObject];
|
||||
if (greaterThanElement && [(id)[greaterThanElement getElementsByTagName: @"DateReceived"] lastObject])
|
||||
{
|
||||
o = [[[greaterThanElement getElementsByTagName: @"Value"] lastObject] textValue];
|
||||
o = [[(id)[greaterThanElement getElementsByTagName: @"Value"] lastObject] textValue];
|
||||
greaterThanQualifier = [EOQualifier qualifierWithQualifierFormat:
|
||||
@"(DATE >= %@)", [o calendarDate]];
|
||||
}
|
||||
|
@ -2890,7 +2888,7 @@ void handle_eas_terminate(int signum)
|
|||
int i, total;
|
||||
|
||||
// FIXME: support more than one CollectionId tag + DeepTraversal
|
||||
folderId = [[[[(id)[theDocumentElement getElementsByTagName: @"Query"] lastObject] getElementsByTagName: @"CollectionId"] lastObject] textValue];
|
||||
folderId = [[(id)[[(id)[theDocumentElement getElementsByTagName: @"Query"] lastObject] getElementsByTagName: @"CollectionId"] lastObject] textValue];
|
||||
realCollectionId = [folderId realCollectionIdWithFolderType: &folderType];
|
||||
realCollectionId = [self globallyUniqueIDToIMAPFolderName: realCollectionId type: folderType];
|
||||
|
||||
|
@ -2929,6 +2927,7 @@ void handle_eas_terminate(int signum)
|
|||
for (i = 0; i < total; i++)
|
||||
{
|
||||
[s appendString: @"<Result xmlns=\"Search:\">"];
|
||||
[s appendFormat: @"<CollectionId xmlns=\"AirSyncBase:\">%@</CollectionId>", folderId];
|
||||
[s appendString: @"<Properties>"];
|
||||
itemId = [[sortedUIDs objectAtIndex: i] stringValue];
|
||||
mailObject = [currentFolder lookupName: itemId inContext: context acquire: NO];
|
||||
|
|
Loading…
Reference in New Issue