amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-03 12:28:51 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: d5c71041bfdd88e4baae24bb7a81f91a5e480457

Browse Source 
Monotone-Revision: 97ce53eed867e1824e43f8db18e4c2e3affcff00

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-01-21T16:35:39
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-01-21 16:35:39 +00:00
parent afea348f67
commit 49bc44c786
1 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
SoObjects/Contacts/SOGoFolder+CardDAV.m
View File

@@ -45,9 +45,9 @@
NSString *baseURL;
SOGoObject <SOGoContactFolder> *o;
o = (id<SOGoContactFolder>)self;
o = (id <SOGoContactFolder>) self;
baseURL = [o baseURLInContext: localContext];
max = [filters count];
for (count = 0; count < max; count++)
{
@@ -58,29 +58,22 @@
objectEnumerator];
while ((contact = [contacts nextObject]))
{
[o appendObject: contact
withBaseURL: baseURL
toREPORTResponse: response];
}
}
}
- (BOOL) _isValidFilter: (NSString *) theString
{
if ([theString caseInsensitiveCompare: @"sn"] == NSOrderedSame)
return YES;
NSString *newString;
if ([theString caseInsensitiveCompare: @"givenname"] == NSOrderedSame)
return YES;
newString = [theString lowercaseString];
if ([theString caseInsensitiveCompare: @"mail"] == NSOrderedSame)
return YES;
if ([theString caseInsensitiveCompare: @"telephonenumber"] == NSOrderedSame)
return YES;
return NO;
return ([theString isEqualToString: @"sn"]
|| [theString isEqualToString: @"givenname"]
|| [theString isEqualToString: @"mail"]
|| [theString isEqualToString: @"telephonenumber"]);
}
- (NSDictionary *) _parseContactFilter: (id <DOMElement>) filterElement
@@ -89,26 +82,24 @@
id <DOMNode> parentNode;
id <DOMNodeList> ranges;
filterData = nil;
parentNode = [filterElement parentNode];
if ([[parentNode tagName] isEqualToString: @"filter"] &&
[self _isValidFilter: [filterElement attribute: @"name"]])
if ([[parentNode tagName] isEqualToString: @"filter"]
&& [self _isValidFilter: [filterElement attribute: @"name"]])
{
ranges = [filterElement getElementsByTagName: @"text-match"];
if ([(NSArray *)ranges count]
&& [(NSArray *)[[ranges objectAtIndex: 0] childNodes] count])
if ([(NSArray *) ranges count]
&& [(NSArray *) [[ranges objectAtIndex: 0] childNodes] count])
{
filterData = [NSMutableDictionary new];
[filterData autorelease];
[filterData setObject: [[(NSArray *)[[ranges objectAtIndex: 0] childNodes] lastObject] data]
forKey: [filterElement attribute: @"name"]];
}
else
filterData = nil;
}
else
filterData = nil;
return filterData;
}
@@ -116,23 +107,19 @@
- (NSArray *) _parseContactFilters: (id <DOMElement>) parentNode
{
NSEnumerator *children;
id<DOMElement> node;
id <DOMElement> node;
NSMutableArray *filters;
NSDictionary *filter;
filters = [[NSMutableArray new] autorelease];
filters = [NSMutableArray array];
children = [[parentNode getElementsByTagName: @"prop-filter"]
objectEnumerator];
node = [children nextObject];
while (node)
while ((node = [children nextObject]))
{
filter = [self _parseContactFilter: node];
if (filter)
[filters addObject: filter];
node = [children nextObject];
}
return filters;