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

merge of '33a4befb91778f46b962f6c895f7697b0d1df722' 

and 'bdbaabe6229246948b265d310037a9694b45d91f'

Monotone-Parent: 33a4befb91778f46b962f6c895f7697b0d1df722
Monotone-Parent: bdbaabe6229246948b265d310037a9694b45d91f
Monotone-Revision: ae35a52b6b85f7b941d2d5a27bdae17a0e87e216

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-10-06T18:27:56
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-10-06 18:27:56 +00:00
parent 725878ebdb 8f85f81cda
commit 244e05307e
6 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2009-10-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m
(-createChildComponentWithRecord:): made method public.
(-createChildComponentWithName:andContent:): made method public.
* SoObjects/SOGo/NSArray+DAV.m (-asDAVPropstatWithStatus:): new
method that creates a "PROPSTAT" element with the specified
status.
2009-10-06 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/SOGoUser.m (_timeValue): improved parsing to

2
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@ -1239,7 +1239,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
//c = [self objectClassForComponentName: [object objectForKey: @"c_component"]];
#warning TODO: determine why this commented invocation takes so long...
// sogoObject = [self _createChildComponentWithRecord: object];
// sogoObject = [self createChildComponentWithRecord: object];
sogoObject = [SOGoCalendarComponent objectWithRecord: object
inContainer: self];

3
SoObjects/SOGo/NSArray+DAV.h
View File

@ -25,6 +25,7 @@
#import <Foundation/NSArray.h>
@class NSDictionary;
@class NSMutableDictionary;
@class NSString;
@ -33,6 +34,8 @@
- (NSString *)
asWebDavStringWithNamespaces: (NSMutableDictionary *) namespaces;
- (NSDictionary *) asDAVPropstatWithStatus: (NSString *) status;
@end
#endif /* NSARRAY_DAV_H */

16
SoObjects/SOGo/NSArray+DAV.m
View File

@ -20,9 +20,12 @@
* Boston, MA 02111-1307, USA.
*/
#import <Foundation/NSDictionary.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSString.h>
#import <SaxObjC/XMLNamespaces.h>
#import "NSObject+DAV.h"
#import "NSArray+DAV.h"
@ -48,4 +51,17 @@
return webdavString;
}
- (NSDictionary *) asDAVPropstatWithStatus: (NSString *) status
{
NSMutableArray *propstat;
propstat = [NSMutableArray arrayWithCapacity: 2];
[propstat addObject: davElementWithContent (@"prop", XMLNS_WEBDAV,
self)];
[propstat addObject: davElementWithContent (@"status", XMLNS_WEBDAV,
status)];
return davElementWithContent (@"propstat", XMLNS_WEBDAV, propstat);
}
@end

4
SoObjects/SOGo/SOGoGCSFolder.h
View File

@ -77,6 +77,10 @@
- (Class) objectClassForComponentName: (NSString *) componentName;
- (Class) objectClassForContent: (NSString *) content;
- (id) createChildComponentWithRecord: (NSDictionary *) record;
- (id) createChildComponentWithName: (NSString *) newName
andContent: (NSString *) newContent;
- (NSArray *) fetchContentObjectNames;
/* folder type */

59
SoObjects/SOGo/SOGoGCSFolder.m
View File

@ -57,6 +57,7 @@
#import "NSDictionary+Utilities.h"
#import "NSArray+Utilities.h"
#import "NSArray+DAV.h"
#import "NSObject+DAV.h"
#import "NSString+Utilities.h"
#import "NSString+DAV.h"
@ -531,18 +532,18 @@ static NSArray *childRecordFields = nil;
return Nil;
}
- (id) _createChildComponentWithRecord: (NSDictionary *) record
- (id) createChildComponentWithRecord: (NSDictionary *) record
{
Class klazz;
klazz = [self objectClassForComponentName:
[record objectForKey: @"c_component"]];
[record objectForKey: @"c_component"]];
return [klazz objectWithRecord: record inContainer: self];
}
- (id) _createChildComponentWithName: (NSString *) newName
andContent: (NSString *) newContent
- (id) createChildComponentWithName: (NSString *) newName
andContent: (NSString *) newContent
{
Class klazz;
NSDictionary *record;
@ -581,14 +582,14 @@ static NSArray *childRecordFields = nil;
[childRecords setObject: record forKey: key];
}
if (record)
obj = [self _createChildComponentWithRecord: record];
obj = [self createChildComponentWithRecord: record];
else
{
request = [localContext request];
if ([[request method] isEqualToString: @"PUT"])
{
obj = [self _createChildComponentWithName: key
andContent: [request contentAsString]];
obj = [self createChildComponentWithName: key
andContent: [request contentAsString]];
[obj setIsNew: YES];
}
}
@ -928,8 +929,8 @@ static NSArray *childRecordFields = nil;
syncTokenInt];
fields = [NSMutableArray arrayWithObjects: @"c_name", @"c_deleted", nil];
[mRecords addObjectsFromArray: [self _fetchFields: fields
withQualifier: qualifier
ignoreDeleted: NO]];
withQualifier: qualifier
ignoreDeleted: NO]];
records = mRecords;
}
else
@ -946,22 +947,6 @@ static NSArray *childRecordFields = nil;
return records;
}
/* These methods are the optimal ones to generate propstats for DAV reports,
it should be used in other subclasses. */
- (NSDictionary *) _davPropstat: (NSArray *) properties
withStatus: (NSString *) status
{
NSMutableArray *propstat;
propstat = [NSMutableArray arrayWithCapacity: 2];
[propstat addObject: davElementWithContent (@"prop", XMLNS_WEBDAV,
properties)];
[propstat addObject: davElementWithContent (@"status", XMLNS_WEBDAV,
status)];
return davElementWithContent (@"propstat", XMLNS_WEBDAV, propstat);
}
- (NSArray *) _davPropstatsWithProperties: (NSArray *) davProperties
andMethodSelectors: (SEL *) selectors
fromRecord: (NSDictionary *) record
@ -978,12 +963,12 @@ static NSArray *childRecordFields = nil;
properties200 = [NSMutableArray arrayWithCapacity: max];
properties404 = [NSMutableArray arrayWithCapacity: max];
sogoObject = [self _createChildComponentWithRecord: record];
sogoObject = [self createChildComponentWithRecord: record];
for (count = 0; count < max; count++)
{
if (selectors[count]
&& [sogoObject respondsToSelector: selectors[count]])
result = [sogoObject performSelector: selectors[count]];
result = [sogoObject performSelector: selectors[count]];
else
result = nil;
@ -996,17 +981,17 @@ static NSArray *childRecordFields = nil;
else
{
propContent = [[davProperties objectAtIndex: count]
asWebDAVTuple];
asWebDAVTuple];
[properties404 addObject: propContent];
}
}
if ([properties200 count])
[propstats addObject: [self _davPropstat: properties200
withStatus: @"HTTP/1.1 200 OK"]];
[propstats addObject: [properties200
asDAVPropstatWithStatus: @"HTTP/1.1 200 OK"]];
if ([properties404 count])
[propstats addObject: [self _davPropstat: properties404
withStatus: @"HTTP/1.1 404 Not Found"]];
[propstats addObject: [properties404
asDAVPropstatWithStatus: @"HTTP/1.1 404 Not Found"]];
return propstats;
}
@ -1018,15 +1003,15 @@ static NSArray *childRecordFields = nil;
andBaseURL: (NSString *) baseURL
{
static NSString *status[] = { @"HTTP/1.1 404 Not Found",
@"HTTP/1.1 201 Created",
@"HTTP/1.1 200 OK" };
@"HTTP/1.1 201 Created",
@"HTTP/1.1 200 OK" };
NSMutableArray *children;
NSString *href;
unsigned int statusIndex;
children = [NSMutableArray arrayWithCapacity: 3];
href = [NSString stringWithFormat: @"%@%@",
baseURL, [record objectForKey: @"c_name"]];
baseURL, [record objectForKey: @"c_name"]];
[children addObject: davElementWithContent (@"href", XMLNS_WEBDAV,
href)];
if (syncToken)
@ -1051,8 +1036,8 @@ static NSArray *childRecordFields = nil;
if (statusIndex)
[children
addObjectsFromArray: [self _davPropstatsWithProperties: properties
andMethodSelectors: selectors
fromRecord: record]];
andMethodSelectors: selectors
fromRecord: record]];
return davElementWithContent (@"sync-response", XMLNS_WEBDAV, children);
}