Monotone-Parent: 0bb415c672cf6fa29a94c71cfade196c42eeb58a

Monotone-Revision: dc1a04dbd8c664b75c03181a48283724ed5866b2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-15T20:22:27
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreMessage.m

@@ -59,8 +59,8 @@
 {
   if ((self = [super init]))
     {
-      attachmentKeys = nil;
-      attachmentParts = nil;
+      attachmentKeys = [NSMutableArray new];
+      attachmentParts = [NSMutableDictionary new];
       activeTables = [NSMutableArray new];
     }
 
@@ -231,6 +231,27 @@
   return MAPISTORE_SUCCESS;
 }
 
+- (MAPIStoreAttachment *) createAttachment
+{
+  MAPIStoreAttachment *newAttachment;
+  uint32_t newAid;
+  NSString *newKey;
+
+  newAid = [attachmentKeys count];
+
+  newAttachment = [MAPIStoreAttachment
+                    mapiStoreObjectWithSOGoObject: nil
+                                      inContainer: self];
+  [newAttachment setIsNew: YES];
+  [newAttachment setAID: newAid];
+  newKey = [NSString stringWithFormat: @"%ul", newAid];
+  [attachmentParts setObject: newAttachment
+                      forKey: newKey];
+  [attachmentKeys addObject: newKey];
+
+  return newAttachment;
+}
+
 - (int) createAttachment: (MAPIStoreAttachment **) attachmentPtr
                    inAID: (uint32_t *) aidPtr
 {
@@ -649,11 +670,15 @@
   [self subclassResponsibility: _cmd];
 }
 
-- (MAPIStoreAttachment *) createAttachment
+- (NSArray *) childKeysMatchingQualifier: (EOQualifier *) qualifier
+                        andSortOrderings: (NSArray *) sortOrderings
 {
-  [self subclassResponsibility: _cmd];
-
-  return nil;
+  if (qualifier)
+    [self errorWithFormat: @"qualifier is not used for attachments"];
+  if (sortOrderings)
+    [self errorWithFormat: @"sort orderings are not used for attachments"];
+  
+  return attachmentKeys;
 }
 
 - (MAPIStoreAttachmentTable *) attachmentTable