Monotone-Parent: a4983f379dc036de6579ce272ecb19b8e655def2

Monotone-Revision: 4f981df6c4bdc933e2028d7a0ac984e74762dcb0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-23T15:53:54
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2010-04-23 15:53:54 +00:00
1 parent e092c4f38a
commit 32eda4b841
5 files changed
+178 -95

No files matched your search

+17 -21
View File
@@ -166,13 +166,11 @@
filter = [[filter stringByReplacingString: @"\\" withString: @"\\\\"]
stringByReplacingString: @"'" withString: @"\\'\\'"];
qs = [NSString stringWithFormat:
@"(c_sn isCaseInsensitiveLike: '%@%%') OR "
@"(c_givenname isCaseInsensitiveLike: '%@%%') OR "
@"(c_cn isCaseInsensitiveLike: '%@%%') OR "
@"(c_mail isCaseInsensitiveLike: '%@%%') OR "
@"(c_telephonenumber isCaseInsensitiveLike: '%%%@%%') OR "
@"(c_o isCaseInsensitiveLike: '%%%@%%')",
filter, filter, filter, filter, filter, filter];
@"(c_sn isCaseInsensitiveLike: '%%%@%%') OR "
@"(c_givenname isCaseInsensitiveLike: '%%%@%%') OR "
@"(c_cn isCaseInsensitiveLike: '%%%@%%') OR "
@"(c_mail isCaseInsensitiveLike: '%%%@%%')",
filter, filter, filter, filter];
qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
}
else
@@ -224,31 +222,30 @@
return newRecords;
}
/* This method returns the quick entry corresponding to the name passed as
parameter. */
- (NSDictionary *) lookupContactWithName: (NSString *) aName
{
NSArray *fields, *dbRecords, *records;
NSDictionary *record;
NSArray *dbRecords;
NSMutableDictionary *record;
EOQualifier *qualifier;
NSString *qs;
fields = folderListingFields;
record = nil;
if (aName && [aName length] > 0)
{
aName = [[aName stringByReplacingString: @"\\" withString: @"\\\\"]
stringByReplacingString: @"'" withString: @"\\'\\'"];
qs = [NSString stringWithFormat: @"(c_name isCaseInsensitiveLike: '%@')", aName];
qs = [NSString stringWithFormat: @"(c_name='%@')", aName];
qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
dbRecords = [[self ocsFolder] fetchFields: fields
dbRecords = [[self ocsFolder] fetchFields: folderListingFields
matchingQualifier: qualifier];
if ([dbRecords count] > 0)
{
records = [self _flattenedRecords: dbRecords];
record = [records lastObject];
}
{
record = [dbRecords objectAtIndex: 0];
[self fixupContactRecord: record];
}
}
return record;
@@ -258,13 +255,12 @@
sortBy: (NSString *) sortKey
ordering: (NSComparisonResult) sortOrdering
{
NSArray *fields, *dbRecords, *records;
NSArray *dbRecords, *records;
EOQualifier *qualifier;
EOSortOrdering *ordering;
fields = folderListingFields;
qualifier = [self _qualifierForFilter: filter];
dbRecords = [[self ocsFolder] fetchFields: fields
dbRecords = [[self ocsFolder] fetchFields: folderListingFields
matchingQualifier: qualifier];
if ([dbRecords count] > 0)