Monotone-Parent: a470eada3340db32324b41d7a4a5c5bf475c5f88

Monotone-Revision: a684808ab0611c3a7938367d09a75f0ba0413a33

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-06-13T21:59:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2008-06-13 21:59:09 +00:00
parent 78db1a24e1
commit 8d1604240b

View file

@ -1474,8 +1474,7 @@ _selectorForProperty (NSString *property)
currentRecord = [records objectAtIndex: count];
recordURL = [NSString stringWithFormat: @"%@%@", baseURL,
[currentRecord objectForKey: @"c_name"]];
[components setObject: currentRecord
forKey: recordURL];
[components setObject: currentRecord forKey: recordURL];
}
return components;
@ -1486,20 +1485,27 @@ _selectorForProperty (NSString *property)
{
NSURL *realBaseURL;
NSArray *cnames;
NSString *cnameBaseURL;
realBaseURL = [NSURL URLWithString: baseURL];
// NSLog (@"deducing names...\n");
if (realBaseURL) /* url has a host part */
cnames = [self _deduceObjectNamesFromFullURLs: urls
withBaseURL: realBaseURL];
{
cnames = [self _deduceObjectNamesFromFullURLs: urls
withBaseURL: realBaseURL];
cnameBaseURL = [realBaseURL absoluteString];
}
else
cnames = [self _deduceObjectNamesFromPartialURLs: urls
withBaseURLString: baseURL];
{
cnames = [self _deduceObjectNamesFromPartialURLs: urls
withBaseURLString: baseURL];
cnameBaseURL = baseURL;
}
// NSLog (@"/deducing names...\n");
return [self _convertRecordsArray:
[self _fetchComponentsMatchingObjectNames: cnames]
withBaseURL: baseURL];
withBaseURL: cnameBaseURL];
}
- (void) _appendComponentProperties: (NSString **) properties