From 41e6fb89d304edf9619641b766bc37ad402a954c Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 13 May 2014 17:54:02 -0400 Subject: [PATCH] Renamed constants in preparation for the big cache cleanup --- OpenChange/MAPIStoreDBFolder.m | 6 +++--- OpenChange/MAPIStoreFolder.m | 6 +++--- OpenChange/MAPIStoreGCSFolder.m | 2 +- OpenChange/MAPIStoreMailFolder.m | 2 +- OpenChange/SOGoMAPIDBFolder.m | 11 +++++------ OpenChange/SOGoMAPIDBObject.h | 8 ++++---- OpenChange/SOGoMAPIDBObject.m | 9 +++++---- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/OpenChange/MAPIStoreDBFolder.m b/OpenChange/MAPIStoreDBFolder.m index 74bf12e2f..e7ff0811b 100644 --- a/OpenChange/MAPIStoreDBFolder.m +++ b/OpenChange/MAPIStoreDBFolder.m @@ -181,7 +181,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact"; [SOGoObject globallyUniqueObjectId]]; fsObject = [SOGoMAPIDBMessage objectWithName: newKey inContainer: sogoObject]; - [fsObject setObjectType: MAPIDBObjectTypeMessage]; + [fsObject setObjectType: MAPIMessageCacheObject]; [fsObject reloadIfNeeded]; newMessage = [MAPIStoreDBMessage mapiStoreObjectWithSOGoObject: fsObject inContainer: self]; @@ -198,7 +198,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact"; ownerUser = [[self userContext] sogoUser]; if ([[context activeUser] isEqual: ownerUser] || [self subscriberCanReadMessages]) - keys = [(SOGoMAPIDBFolder *) sogoObject childKeysOfType: MAPIDBObjectTypeMessage + keys = [(SOGoMAPIDBFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject includeDeleted: NO matchingQualifier: qualifier andSortOrderings: sortOrderings]; @@ -211,7 +211,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact"; - (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier andSortOrderings: (NSArray *) sortOrderings { - return [dbFolder childKeysOfType: MAPIDBObjectTypeFolder + return [dbFolder childKeysOfType: MAPIFolderCacheObject includeDeleted: NO matchingQualifier: qualifier andSortOrderings: sortOrderings]; diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m index 2e54838b3..8368e1b2b 100644 --- a/OpenChange/MAPIStoreFolder.m +++ b/OpenChange/MAPIStoreFolder.m @@ -138,7 +138,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe // ASSIGN (propsMessage, // [SOGoMAPIDBMessage objectWithName: @"properties.plist" // inContainer: dbFolder]); - // [propsMessage setObjectType: MAPIDBObjectTypeInternal]; + // [propsMessage setObjectType: MAPIInternalCacheObject]; // [propsMessage reloadIfNeeded]; [properties release]; properties = [dbFolder properties]; @@ -1221,7 +1221,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe - (NSArray *) faiMessageKeysMatchingQualifier: (EOQualifier *) qualifier andSortOrderings: (NSArray *) sortOrderings { - return [dbFolder childKeysOfType: MAPIDBObjectTypeFAI + return [dbFolder childKeysOfType: MAPIFAICacheObject includeDeleted: NO matchingQualifier: qualifier andSortOrderings: sortOrderings]; @@ -1531,7 +1531,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe newKey = [NSString stringWithFormat: @"%@.plist", [SOGoObject globallyUniqueObjectId]]; dbObject = [SOGoMAPIDBMessage objectWithName: newKey inContainer: dbFolder]; - [dbObject setObjectType: MAPIDBObjectTypeFAI]; + [dbObject setObjectType: MAPIFAICacheObject]; [dbObject setIsNew: YES]; newMessage = [MAPIStoreFAIMessageK mapiStoreObjectWithSOGoObject: dbObject inContainer: self]; diff --git a/OpenChange/MAPIStoreGCSFolder.m b/OpenChange/MAPIStoreGCSFolder.m index 52d2b0866..ce4bb870f 100644 --- a/OpenChange/MAPIStoreGCSFolder.m +++ b/OpenChange/MAPIStoreGCSFolder.m @@ -74,7 +74,7 @@ static Class NSNumberK; ASSIGN (versionsMessage, [SOGoMAPIDBMessage objectWithName: @"versions.plist" inContainer: dbFolder]); - [versionsMessage setObjectType: MAPIDBObjectTypeInternal]; + [versionsMessage setObjectType: MAPIInternalCacheObject]; } - (void) dealloc diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m index bcc0253ef..324c749ea 100644 --- a/OpenChange/MAPIStoreMailFolder.m +++ b/OpenChange/MAPIStoreMailFolder.m @@ -106,7 +106,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK; ASSIGN (versionsMessage, [SOGoMAPIDBMessage objectWithName: @"versions.plist" inContainer: dbFolder]); - [versionsMessage setObjectType: MAPIDBObjectTypeInternal]; + [versionsMessage setObjectType: MAPIInternalCacheObject]; } - (BOOL) ensureFolderExists diff --git a/OpenChange/SOGoMAPIDBFolder.m b/OpenChange/SOGoMAPIDBFolder.m index 1ed8d23ff..76522f30e 100644 --- a/OpenChange/SOGoMAPIDBFolder.m +++ b/OpenChange/SOGoMAPIDBFolder.m @@ -33,7 +33,6 @@ #import #import #import -// #import #import #import @@ -77,10 +76,10 @@ Class SOGoMAPIDBObjectK = Nil; { if ((self = [super initWithName: name inContainer: newContainer])) { - objectType = MAPIDBObjectTypeFolder; + objectType = MAPIFolderCacheObject; aclMessage = [SOGoMAPIDBObject objectWithName: @"permissions" inContainer: self]; - [aclMessage setObjectType: MAPIDBObjectTypeInternal]; + [aclMessage setObjectType: MAPIInternalCacheObject]; [aclMessage retain]; } @@ -201,7 +200,7 @@ Class SOGoMAPIDBObjectK = Nil; - (NSArray *) toManyRelationshipKeys { - return [self childKeysOfType: MAPIDBObjectTypeFolder + return [self childKeysOfType: MAPIFolderCacheObject includeDeleted: NO matchingQualifier: nil andSortOrderings: nil]; @@ -209,7 +208,7 @@ Class SOGoMAPIDBObjectK = Nil; - (NSArray *) toOneRelationshipKeys { - return [self childKeysOfType: MAPIDBObjectTypeMessage + return [self childKeysOfType: MAPIMessageCacheObject includeDeleted: NO matchingQualifier: nil andSortOrderings: nil]; @@ -359,7 +358,7 @@ Class SOGoMAPIDBObjectK = Nil; record = [self lookupRecord: childPath newerThanVersion: -1]; if (record) { - if ([[record objectForKey: @"c_type"] intValue] == MAPIDBObjectTypeFolder) + if ([[record objectForKey: @"c_type"] intValue] == MAPIFolderCacheObject) objectClass = isa; else objectClass = SOGoMAPIDBObjectK; diff --git a/OpenChange/SOGoMAPIDBObject.h b/OpenChange/SOGoMAPIDBObject.h index 6bf1750bb..4d2b0d0c0 100644 --- a/OpenChange/SOGoMAPIDBObject.h +++ b/OpenChange/SOGoMAPIDBObject.h @@ -34,10 +34,10 @@ @class EOAdaptor; typedef enum { - MAPIDBObjectTypeFolder = 1, - MAPIDBObjectTypeMessage = 2, - MAPIDBObjectTypeFAI = 3, - MAPIDBObjectTypeInternal = 99 /* object = property list */ + MAPIFolderCacheObject = 1, + MAPIMessageCacheObject = 2, + MAPIFAICacheObject = 3, + MAPIInternalCacheObject = 99 /* object = property list */ } MAPIDBObjectType; @interface SOGoMAPIDBObject : SOGoMAPIObject diff --git a/OpenChange/SOGoMAPIDBObject.m b/OpenChange/SOGoMAPIDBObject.m index 7e54621df..0ebc3af6f 100644 --- a/OpenChange/SOGoMAPIDBObject.m +++ b/OpenChange/SOGoMAPIDBObject.m @@ -75,12 +75,13 @@ static EOAttribute *textColumn = nil; /* = (@"CREATE TABLE %@ (" @" c_path VARCHAR(255) PRIMARY KEY," - @" c_type VARCHAR(20) NOT NULL," + @" c_parent_path VARCHAR(255)," + @" c_type SMALLINT NOT NULL," @" c_creationdate INT4 NOT NULL," @" c_lastmodified INT4 NOT NULL," @" c_version INT4 NOT NULL DEFAULT 0," @" c_deleted SMALLINT NOT NULL DEFAULT 0," - @" c_content TEXT" + @" c_content TEXT)"); */ /* indexes: @@ -226,7 +227,7 @@ static EOAttribute *textColumn = nil; switch (objectType) { - case MAPIDBObjectTypeMessage: + case MAPIMessageCacheObject: mapiMsgClass = [properties objectForKey: MAPIPropertyKey (PidTagMessageClass)]; if (mapiMsgClass) @@ -245,7 +246,7 @@ static EOAttribute *textColumn = nil; className = @"MAPIStoreDBMessage"; } break; - case MAPIDBObjectTypeFAI: + case MAPIFAICacheObject: className = @"MAPIStoreFAIMessage"; break; default: