Monotone-Parent: f6b8a3a72253a47ef5eda38ba241b206f9b48f65

Monotone-Revision: 1fb2ab16dbaee22f67d20e86943f297a72cf6c72

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-07T23:34:25
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2007-11-07 23:34:25 +00:00
1 parent 133ac4933d
commit 38d3aa757e
10 files changed
+34 -61

No files matched your search

+2 -37
View File
@@ -45,20 +45,16 @@
@implementation SOGoContactLDAPFolder
#warning this should be unified within SOGoFolder
- (void) appendObject: (NSDictionary *) object
withBaseURL: (NSString *) baseURL
toREPORTResponse: (WOResponse *) r
{
SOGoContactLDIFEntry *component;
Class componentClass;
NSString *name, *etagLine, *contactString;
name = [object objectForKey: @"c_name"];
componentClass = [SOGoContactLDIFEntry class];
component = [componentClass contactEntryWithName: name
withLDIFEntry: object inContainer: self];
component = [self lookupName: name inContext: context acquire: NO];
[r appendContentString: @" <D:response>\r\n"];
[r appendContentString: @" <D:href>"];
@@ -163,42 +159,11 @@
if (!obj)
{
ldifEntry = [ldapSource lookupContactEntry: objectName];
#if 0
obj = ((ldifEntry)
? [SOGoContactLDIFEntry contactEntryWithName: objectName
withLDIFEntry: ldifEntry
inContainer: self]
: [NSException exceptionWithHTTPStatus: 404]);
#else
if (ldifEntry)
obj = [SOGoContactLDIFEntry contactEntryWithName: objectName
withLDIFEntry: ldifEntry
inContainer: self];
else
{
NSArray *davNamespaces;
NSDictionary *davInvocation;
NSString *objcMethod;
davNamespaces = [self davNamespaces];
if ([davNamespaces count] > 0)
{
davInvocation = [objectName asDavInvocation];
if (davInvocation
&& [davNamespaces
containsObject: [davInvocation objectForKey: @"ns"]])
{
objcMethod = [[davInvocation objectForKey: @"method"]
davMethodToObjC];
obj = [[SoSelectorInvocation alloc]
initWithSelectorNamed:
[NSString stringWithFormat: @"%@:", objcMethod]
addContextParameter: YES];
[obj autorelease];
}
}
}
#endif
}
return obj;