From b906cf066abaa36784811456fb023dc0f09c3ac1 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 30 Mar 2012 21:21:51 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: 0d7d8533911c3bec7d5b51cc919acb5aa7e15e7d Monotone-Revision: 73baf2c24acbb1fb98296fc8ab448b3b3c5ba7a7 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-03-30T21:21:51 --- ChangeLog | 9 +++++++++ OGoContentStore/OCSContactFieldExtractor.m | 2 +- Tools/SOGoToolRemoveDoubles.m | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1a24929e..7d935bc7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-04-03 Francis Lachapelle + + * Tools/SOGoToolRemoveDoubles.m (-removeDoublesFromFolder) + (-amountOfFilledQuickFields): lowered the case of the + telephonenumber table fieldname. + + * OGoContentStore/OCSContactFieldExtractor.m + (-extractQuickFieldsFromVCard): idem. + 2012-03-29 Francis Lachapelle * UI/WebServerResources/UIxPreferences.js (savePreferences): fixed diff --git a/OGoContentStore/OCSContactFieldExtractor.m b/OGoContentStore/OCSContactFieldExtractor.m index d74e06fd0..8b1445316 100644 --- a/OGoContentStore/OCSContactFieldExtractor.m +++ b/OGoContentStore/OCSContactFieldExtractor.m @@ -54,7 +54,7 @@ forKey: @"c_givenName"]; value = [vCard preferredTel]; if (value) - [fields setObject: value forKey: @"c_telephoneNumber"]; + [fields setObject: value forKey: @"c_telephonenumber"]; value = [vCard preferredEMail]; if (![value isNotNull]) value = @""; diff --git a/Tools/SOGoToolRemoveDoubles.m b/Tools/SOGoToolRemoveDoubles.m index a4be92c3f..79ab21bd5 100644 --- a/Tools/SOGoToolRemoveDoubles.m +++ b/Tools/SOGoToolRemoveDoubles.m @@ -304,7 +304,7 @@ { quickFields = [NSArray arrayWithObjects: @"c_givenname", @"c_cn", @"c_sn", @"c_screenname", @"c_l", @"c_mail", - @"c_o", @"c_ou", @"c_telephoneNumber", nil]; + @"c_o", @"c_ou", @"c_telephonenumber", nil]; [quickFields retain]; } @@ -466,7 +466,7 @@ fields = [NSArray arrayWithObjects: @"c_name", @"c_givenname", @"c_cn", @"c_sn", @"c_screenname", @"c_l", @"c_mail", @"c_o", - @"c_ou", @"c_telephoneNumber", @"c_content", @"c_version", + @"c_ou", @"c_telephonenumber", @"c_content", @"c_version", @"c_creationdate", @"c_lastmodified", nil]; qualifier = [EOQualifier qualifierWithQualifierFormat: @"c_component = %@", @"vcard"];