Monotone-Parent: 67c89629b9aa3e1a71a6d431d2827a73f678c9b7

Monotone-Revision: 0536d34a9212fa68a10f5a18d95efd01e0c46aac

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-03-20T13:40:22
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-03-20 13:40:22 +00:00
parent d0ba5254f9
commit 34619a5eda
1 changed files with 10 additions and 23 deletions

View File

@ -157,17 +157,14 @@ static NSNumber *sharedYes = nil;
NSArray *properties; NSArray *properties;
unsigned int count, max; unsigned int count, max;
[r appendContentString: @"<D:propstat>"]; [r appendContentString: @"<D:propstat><D:prop>"];
[r appendContentString: @"<D:prop>"];
properties = [propstat objectForKey: @"properties"]; properties = [propstat objectForKey: @"properties"];
max = [properties count]; max = [properties count];
for (count = 0; count < max; count++) for (count = 0; count < max; count++)
[r appendContentString: [properties objectAtIndex: count]]; [r appendContentString: [properties objectAtIndex: count]];
[r appendContentString: @"</D:prop>"]; [r appendContentString: @"</D:prop><D:status>"];
[r appendContentString: @"<D:status>"];
[r appendContentString: [propstat objectForKey: @"status"]]; [r appendContentString: [propstat objectForKey: @"status"]];
[r appendContentString: @"</D:status>"]; [r appendContentString: @"</D:status></D:propstat>"];
[r appendContentString: @"</D:propstat>"];
} }
#warning we should use the EOFetchSpecification for that!!! (see doPROPFIND:) #warning we should use the EOFetchSpecification for that!!! (see doPROPFIND:)
@ -191,12 +188,8 @@ static NSNumber *sharedYes = nil;
{ {
methodSel = NSSelectorFromString(methodName); methodSel = NSSelectorFromString(methodName);
if ([sogoObject respondsToSelector: methodSel]) if ([sogoObject respondsToSelector: methodSel])
{ value = [[sogoObject performSelector: methodSel]
value = [[sogoObject performSelector: methodSel] stringByEscapingXMLString];
stringByEscapingXMLString];
if (![value length])
NSLog (@"value empty?");
}
} }
return value; return value;
@ -334,31 +327,27 @@ static NSNumber *sharedYes = nil;
NSEnumerator *propstats; NSEnumerator *propstats;
NSDictionary *propstat; NSDictionary *propstat;
[r appendContentString: @" <D:response>\r\n"]; [r appendContentString: @"<D:response><D:href>"];
[r appendContentString: @" <D:href>"];
[r appendContentString: baseURL]; [r appendContentString: baseURL];
if (![baseURL hasSuffix: @"/"]) if (![baseURL hasSuffix: @"/"])
[r appendContentString: @"/"]; [r appendContentString: @"/"];
[r appendContentString: [object objectForKey: @"c_name"]]; [r appendContentString: [object objectForKey: @"c_name"]];
[r appendContentString: @"</D:href>\r\n"]; [r appendContentString: @"</D:href>"];
propstats = [[self _propstats: properties ofObject: object] propstats = [[self _propstats: properties ofObject: object]
objectEnumerator]; objectEnumerator];
while ((propstat = [propstats nextObject])) while ((propstat = [propstats nextObject]))
[self _appendPropstat: propstat toResponse: r]; [self _appendPropstat: propstat toResponse: r];
[r appendContentString: @" </D:response>\r\n"]; [r appendContentString: @"</D:response>\r\n"];
} }
- (void) appendMissingObjectRef: (NSString *) href - (void) appendMissingObjectRef: (NSString *) href
toComplexResponse: (WOResponse *) r toComplexResponse: (WOResponse *) r
{ {
[r appendContentString: @" <D:response>\r\n"]; [r appendContentString: @"<D:response><D:href>"];
[r appendContentString: @" <D:href>"];
[r appendContentString: href]; [r appendContentString: href];
[r appendContentString: @"</D:href>\r\n"]; [r appendContentString: @"</D:href><D:status>HTTP/1.1 404 Not Found</D:status></D:response>\r\n"];
[r appendContentString: @" <D:status>HTTP/1.1 404 Not Found</D:status>\r\n"];
[r appendContentString: @" </D:response>\r\n"];
} }
- (void) _appendTimeRange: (id <DOMElement>) timeRangeElement - (void) _appendTimeRange: (id <DOMElement>) timeRangeElement
@ -506,8 +495,6 @@ static NSNumber *sharedYes = nil;
{ {
urlComponents = [componentURLPath componentsSeparatedByString: @"/"]; urlComponents = [componentURLPath componentsSeparatedByString: @"/"];
cName = [urlComponents objectAtIndex: [urlComponents count] - 1]; cName = [urlComponents objectAtIndex: [urlComponents count] - 1];
if ([cName isEqualToString: @"2AAC-4E8AB421-1-B767AA80"])
NSLog (@"breakpoint...");
component = [NSDictionary dictionaryWithObject: cName forKey: @"c_name"]; component = [NSDictionary dictionaryWithObject: cName forKey: @"c_name"];
} }