Monotone-Parent: d14cd8383abb887a8f6ab0d37123f98344e95100

Monotone-Revision: e89976befd12af0a55cc75574e64196ca89eb6d6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-27T21:54:44
Monotone-Branch: ca.inverse.sogo

SOPE/NGCards/NGCardsSaxHandler.m

@@ -60,7 +60,7 @@
 
 /* state */
 
-- (void)resetExceptResult
+- (void) resetExceptResult
 {
   if (content)
     {
@@ -130,7 +130,7 @@
   }
 }
 
-- (void)endValueTag
+- (void) endValueTag
 {
   [types removeAllObjects];
   [args  removeAllObjects];
@@ -151,14 +151,14 @@
   currentGroup = nil;
 }
 
-- (void)startVCardSet
+- (void) startVCardSet
 {
   currentCardGroup = nil;
   currentGroup = nil;
   vcs.isInVCardSet = 1;
 }
 
-- (void)endVCardSet
+- (void) endVCardSet
 {
   vcs.isInVCardSet = 0;
 }

SOPE/NGCards/versitCardsSaxDriver/ChangeLog

@@ -1,3 +1,9 @@
+2007-08-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* VSSaxDriver.m ([VSSaxDriver
+	-parseFromSource:_sourcesystemId:_sysId]): report only tags for
+	which the content is not empty.
+
 2007-05-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* VSSaxDriver.m ([VSSaxDriver +initialize]): removed the space

SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m

@@ -471,20 +471,17 @@ static VSStringFormatter *stringFormatter = nil;
                    withAttrs: (SaxAttributes *) _attrs 
                   andContent: (NSString *) _content 
 {
-  /*
-    This is called for all non-BEGIN|END types.
-  */
+  VSSaxTag *a;
+  NSString *testContent;
 
-//   _content = [stringFormatter stringByUnescapingRFC2445Text: _content];
+  /* This is called for all non-BEGIN|END types. */
+  testContent = [[_content unescapedFromCard] stringByReplacingString: @";"
+					      withString: @""];
 
-  /* check whether type should be reported as an attribute in XML */
-  
-  [self _beginTag: _tagName group: _group withAttrs: _attrs];
-  
-  if ([_content length] > 0)
+  if ([[testContent stringByTrimmingSpaces] length] > 0)
     {
-      VSSaxTag *a;
-      
+      [self _beginTag: _tagName group: _group withAttrs: _attrs];
+  
       a = [(VSSaxTag *)[VSSaxTag alloc]
                        initWithContentString: [_content unescapedFromCard]];
       if (a)
@@ -492,9 +489,9 @@ static VSStringFormatter *stringFormatter = nil;
           [elementList addObject: a];
           [a release];
         }
-    }
 
-  [self _endTag: _tagName];
+      [self _endTag: _tagName];
+    }
 }
 
 /* report events for collected elements */