git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1161 d1b88da0-ebda-0310...

diff --git a/SOPE/NGCards/NGCardsSaxHandler.m b/SOPE/NGCards/NGCardsSaxHandler.m
index e91cb36c9d4fa187f7baae5926d128c68cfc78fd..dd939c179b64da42498ae0d0783a28f5de059a3e 100644 (file)
--- a/SOPE/NGCards/NGCardsSaxHandler.m
+++ b/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;
 }

diff --git a/SOPE/NGCards/versitCardsSaxDriver/ChangeLog b/SOPE/NGCards/versitCardsSaxDriver/ChangeLog
index 454e8397cdaa549f49e2e4070f4dbd406f5d2809..a39b140615e046d15c50a3e54e8bb02b243859e0 100644 (file)
--- a/SOPE/NGCards/versitCardsSaxDriver/ChangeLog
+++ b/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

diff --git a/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m b/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m
index 138df5e4a9adc047fb34b2298cf88dd9a345ac81..98c3037a84bb5fe135d5ea142292553522088107 100644 (file)
--- a/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m
+++ b/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 */