amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-06 04:20:33 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: fc9d10c123885769669adb2eef1fa95420c32ff6

Browse Source 
Monotone-Revision: 6e9bce1000589aa89ad5a242618e33803b931ca2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-02T20:06:53
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-04-02 20:06:53 +00:00
parent ad372b07aa
commit 973fe8eb87
8 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OGoContentStore/OCSContactFieldExtractor.m
+15 -16
View File
@@ -42,7 +42,7 @@ static NSString *fieldNames[] = {
nil, nil
};
- (NSMutableDictionary *) extractQuickFieldsFromVCard: (NGVCard *) _vCard
- (NSMutableDictionary *) extractQuickFieldsFromVCard: (NGVCard *) vCard
{
NSMutableDictionary *fields;
NSArray *values;
@@ -50,15 +50,15 @@ static NSString *fieldNames[] = {
NSString *value;
unsigned int max;
if (_vCard == nil)
if (vCard == nil)
return nil;
fields = [NSMutableDictionary dictionaryWithCapacity:16];
value = [_vCard fn];
value = [vCard fn];
if (value)
[fields setObject: value forKey: @"cn"];
values = [_vCard n];
values = [vCard n];
if (values)
{
max = [values count];
@@ -70,26 +70,25 @@ static NSString *fieldNames[] = {
forKey: @"givenName"];
}
}
value = [_vCard preferredTel];
value = [vCard preferredTel];
if (value)
[fields setObject: value forKey: @"telephoneNumber"];
value = [_vCard preferredEMail];
value = [vCard preferredEMail];
if (value)
[fields setObject: value forKey: @"mail"];
values = [_vCard org];
if (values)
values = [vCard org];
max = [values count];
if (max > 0)
{
max = [values count];
if (max > 0)
{
[fields setObject: [values objectAtIndex: 0] forKey: @"o"];
if (max > 1)
[fields setObject: [values objectAtIndex: 1] forKey: @"ou"];
}
[fields setObject: [values objectAtIndex: 0] forKey: @"o"];
if (max > 1)
[fields setObject: [values objectAtIndex: 1] forKey: @"ou"];
}
adr = [_vCard preferredAdr];
adr = [vCard preferredAdr];
if (adr)
[fields setObject: [adr value: 3] forKey: @"l"];
value = [[vCard uniqueChildWithTag: @"X-AIM"] value: 0];
[fields setObject: value forKey: @"screenname"];
return fields;
}
OGoContentStore/contact.ocs
+5
View File
@@ -24,6 +24,11 @@
sqlType = "VARCHAR(256)";
allowsNull = YES;
},
{
columnName = screenname;
sqlType = "VARCHAR(256)";
allowsNull = YES;
},
{
columnName = l;
sqlType = "VARCHAR(256)";
OGoContentStore/sql/generate-folderinfo-sql-for-users.sh
+1
View File
@@ -110,6 +110,7 @@ CREATE TABLE SOGo_${USER_TABLE}_contacts_quick (
givenname VARCHAR(256),
cn VARCHAR(256),
sn VARCHAR(256),
screenname VARCHAR(256),
l VARCHAR(256),
mail VARCHAR(256),
o VARCHAR(256),