enhanced contact extractor to be able to deal with vCards

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@735 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/OGoContentStore/ChangeLog b/SOGo/OGoContentStore/ChangeLog
index dc8f3308c2e734f566505cf46a11698b7ba178d2..bbc10df0209a08be7138851903c55677511dfde4 100644 (file)
--- a/SOGo/OGoContentStore/ChangeLog
+++ b/SOGo/OGoContentStore/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-13  Helge Hess  <helge.hess@opengroupware.org>
+
+       * OCSContactFieldExtractor.m: do not crash if the content is not a
+         proper property list, added ability to extract fields from a vCard
+         (v0.9.30)
+
 2005-07-12  Helge Hess  <helge.hess@opengroupware.org>
 
        * added sql/profile-create.psql to create the user-profile database

diff --git a/SOGo/OGoContentStore/OCSContactFieldExtractor.m b/SOGo/OGoContentStore/OCSContactFieldExtractor.m
index 863b15f032af41c4ef5c63f6517f1462c143de22..36e8a7c228bb2ebd9583884fe5c63e53e19a1db0 100644 (file)
--- a/SOGo/OGoContentStore/OCSContactFieldExtractor.m
+++ b/SOGo/OGoContentStore/OCSContactFieldExtractor.m
@@ -24,22 +24,65 @@
 @interface OCSContactFieldExtractor : GCSFieldExtractor
 @end
 
+#include <NGiCal/NGVCard.h>
 #include "common.h"
 
 @implementation OCSContactFieldExtractor
 
+static NSString *fieldNames[] = {
+  /* quickfield,      vCard KVC path */
+  @"givenName",       @"n.given",
+  @"cn",              @"fn.stringValue",
+  @"sn",              @"n.family",
+  @"l",               @"preferredAdr.locality",
+  @"mail",            @"preferredEMail.stringValue",
+  @"o",               @"org.orgnam",
+  @"ou",              @"org.orgunit",
+  @"telephoneNumber", @"preferredTel.stringValue",
+  nil, nil
+};
+
+- (NSMutableDictionary *)extractQuickFieldsFromVCard:(NGVCard *)_vCard {
+  NSMutableDictionary *fields;
+  unsigned i;
+
+  if (_vCard == nil)
+    return nil;
+  
+  fields = [NSMutableDictionary dictionaryWithCapacity:16];
+
+  for (i = 0; fieldNames[i] != nil; i += 2) {
+    id value;
+
+    value = ([fieldNames[i + 1] length] > 0)
+      ? [_vCard valueForKeyPath:fieldNames[i + 1]]
+      : nil;
+    if (![value isNotNull]) value = [NSNull null];
+    
+    [fields setObject:value forKey:[fieldNames[i] lowercaseString]];
+  }
+  return fields;
+}
+
+- (NSMutableDictionary *)extractQuickFieldsFromVCardString:(NSString *)_str {
+  NSArray *vCards;
+  
+  if ((vCards = [NGVCard parseVCardsFromSource:_str]) == nil) {
+    [self errorWithFormat:@"Could not parse content as a vCard."];
+    return nil;
+  }
+  if ([vCards count] == 0) {
+    [self errorWithFormat:@"Could not parse content as a vCard."];
+    return nil;
+  }
+  
+  if ([vCards count] > 1)
+    [self warnWithFormat:@"More than one vCard in content, using first."];
+  
+  return [self extractQuickFieldsFromVCard:[vCards objectAtIndex:0]];
+}
+
 - (NSMutableDictionary *)extractQuickFieldsFromContent:(NSString *)_content {
-  static NSString *fieldNames[] = {
-    @"givenName",
-    @"cn",
-    @"sn",
-    @"l",
-    @"mail",
-    @"o",
-    @"ou",
-    @"telephoneNumber",
-    nil
-  };
   NSMutableDictionary *fields;
   NSDictionary *plist;
   unsigned i;
@@ -47,6 +90,9 @@
   if ([_content length] == 0)
     return nil;
   
+  if ([_content hasPrefix:@"BEGIN:VCARD"])
+    return [self extractQuickFieldsFromVCardString:_content];
+  
   // TODO: we want to support vcard storage in the future?!
   
   if ((plist = [_content propertyList]) == nil) {
@@ -54,13 +100,18 @@
     return nil;
   }
   
+  if (![plist isKindOfClass:[NSDictionary class]]) {
+    [self logWithFormat:@"ERROR: parsed property list is not a dictionary!"];
+    return nil;
+  }
+  
   fields = [NSMutableDictionary dictionaryWithCapacity:16];
   
   /* copy field values to quick record */
-  for (i = 0; fieldNames[i] != nil; i++) {
+  for (i = 0; fieldNames[i] != nil; i += 2) {
     NSString *fieldName, *sqlName;
     id value;
-
+    
     fieldName = fieldNames[i];
     sqlName   = [fieldName lowercaseString]; /* actually pgsql doesn't care */
     

diff --git a/SOGo/OGoContentStore/Version b/SOGo/OGoContentStore/Version
index c8df7a3e59583972a40339ad3cd98591f0327514..ae2cbb060abe8de8bfa52dbf2199636f6bf20e01 100644 (file)
--- a/SOGo/OGoContentStore/Version
+++ b/SOGo/OGoContentStore/Version
@@ -2,8 +2,9 @@
 
 MAJOR_VERSION=0
 MINOR_VERSION=9
-SUBMINOR_VERSION:=29
+SUBMINOR_VERSION:=30
 
+# v0.9.30 requires libNGiCal          v4.5.48
 # v0.9.26 requires libGDLContentStore v4.5.26
 # v0.9.19 requires libNGiCal          v4.5.40
 # v0.9.18 requires libNGiCal          v4.5.38