Monotone-Parent: 54cc41b15e02fc61bfa80e7db07aeb97e541fdfc

Monotone-Revision: 3c8a49fe7ef93ec55aaeef9dd064be1de6052cfe

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-21T15:50:07

SoObjects/Contacts/SOGoContactLDIFEntry.m

@@ -95,7 +95,7 @@
   [vcard setProdID: [NSString
                       stringWithFormat: @"-//Inverse inc./SOGo %@//EN",
                       SOGoVersion]];
-  [vcard updateFromLDIFRecord: [self ldifRecord]];
+  [vcard updateFromLDIFRecord: [self simplifiedLDIFRecord]];
 
   return vcard;
 }
@@ -115,6 +115,37 @@
   return ldifEntry;
 }
 
+- (NSDictionary *) simplifiedLDIFRecord
+{
+  NSMutableDictionary *newRecord;
+  NSArray *keys;
+  NSUInteger count, max;
+  NSString *key;
+  id value;
+
+  newRecord = [[self ldifRecord] mutableCopy];
+  [newRecord autorelease];
+
+  keys = [newRecord allKeys];
+  max = [keys count];
+  for (count = 0; count < max; count++)
+    {
+      key = [keys objectAtIndex: count];
+      value = [newRecord objectForKey: key];
+      if ([value isKindOfClass: [NSArray class]]
+          && ![key isEqualToString: @"objectclass"])
+        {
+          if ([value count] > 0)
+            [newRecord setObject: [value objectAtIndex: 0]
+                          forKey: key];
+          else
+            [newRecord removeObjectForKey: key];
+        }
+    }
+
+  return newRecord;
+}
+
 - (BOOL) hasPhoto
 {
   return NO;