Monotone-Parent: fe67bff0ab967ccf03cfe54c248865c9df889c21

Monotone-Revision: 7342d9cd31675160736e0f2db8a83047d9babea9

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-10-09T17:19:20
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-10-09 17:19:20 +00:00
parent 084ffb7bc8
commit 03382298b8
10 changed files with 128 additions and 42 deletions
+15 -23
View File
@@ -221,50 +221,42 @@
{
NSEnumerator *folders, *currentInfos;
SOGoAppointmentFolder *currentFolder;
NSMutableDictionary *infos, *currentInfo, *newInfo;
NSString *owner, *uid;
NSMutableDictionary *newInfo;
NSMutableArray *infos;
NSNull *marker;
SOGoAppointmentFolders *clientObject;
marker = [NSNull null];
infos = [NSMutableDictionary dictionary];
clientObject = [self clientObject];
clientObject = [self clientObject];
folders = [[clientObject subFolders] objectEnumerator];
currentFolder = [folders nextObject];
infos = [NSMutableArray array];
while (currentFolder)
{
if ([currentFolder isActive])
{
owner = [currentFolder ownerInContext: context];
currentInfos = [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
component: component] objectEnumerator];
newInfo = [currentInfos nextObject];
while (newInfo)
while ((newInfo = [currentInfos nextObject]))
{
uid = [newInfo objectForKey: @"c_uid"];
currentInfo = [infos objectForKey: uid];
if (!currentInfo
|| [owner isEqualToString: userLogin])
{
[self _updatePrivacyInComponent: newInfo
fromFolder: currentFolder];
[newInfo setObject: [currentFolder nameInContainer]
forKey: @"c_folder"];
// [newInfo setObject: owner forKey: @"c_owner"];
[infos setObject: [newInfo objectsForKeys: fields
notFoundMarker: marker]
forKey: uid];
}
newInfo = [currentInfos nextObject];
[self _updatePrivacyInComponent: newInfo
fromFolder: currentFolder];
[newInfo setObject: [currentFolder nameInContainer]
forKey: @"c_folder"];
[infos addObject: [newInfo objectsForKeys: fields
notFoundMarker: marker]];
}
}
currentFolder = [folders nextObject];
}
return [infos allValues];
return infos;
}
- (WOResponse *) _responseWithData: (NSArray *) data