improved error reporting

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1247 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-ical/versitSaxDriver/ChangeLog b/sope-ical/versitSaxDriver/ChangeLog
index 0b0dd0eacc56d6fed6f5b6ae1fdf884cb220bef1..c6700d6f57ab5f02f9cefd11c371134d43b77410 100644 (file)
--- a/sope-ical/versitSaxDriver/ChangeLog
+++ b/sope-ical/versitSaxDriver/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-08  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * VSSaxDriver.m: improved error reporting in case no data could be
+         retrieved from a URL (v4.5.22)
+       
 2005-12-05  Helge Hess  <helge.hess@skyrix.com>
 
        * v4.5.21

diff --git a/sope-ical/versitSaxDriver/VSSaxDriver.m b/sope-ical/versitSaxDriver/VSSaxDriver.m
index 5013ea9296dfea87f4ac156bf836755e8c514731..df94370fd9e1d2a1284db8d7663ae9d146759f69 100644 (file)
--- a/sope-ical/versitSaxDriver/VSSaxDriver.m
+++ b/sope-ical/versitSaxDriver/VSSaxDriver.m
@@ -1016,15 +1016,32 @@ static VSStringFormatter *stringFormatter = nil;
     NSLog(@"%s: parse: %@ (sysid=%@)", __PRETTY_FUNCTION__, _source, _sysId);
   
   if ([_source isKindOfClass:[NSURL class]]) {
-    if (_sysId == nil) _sysId = [_source absoluteString];
+    NSURL *url;
+
+    url = _source;
+    if (_sysId == nil) _sysId = [url absoluteString];
 
     if (debugOn) {
       NSLog(@"%s: trying to load URL: %@ (sysid=%@)",__PRETTY_FUNCTION__, 
-           _source, _sysId);
+           url, _sysId);
     }
     
     // TODO: remember encoding of source
-    _source = [_source resourceDataUsingCache:NO];
+    _source = [url resourceDataUsingCache:NO];
+    if (_source == nil || ![_source length]) {
+      SaxParseException *e;
+      NSString          *s;
+    
+      if (debugOn) 
+        NSLog(@"%s: got no data from url: %@", __PRETTY_FUNCTION__, url);
+    
+      s = [NSString stringWithFormat:@"got no data from url: %@", url]; 
+      e = (id)[SaxParseException exceptionWithName:@"SaxIOException"
+                                 reason:s
+                                 userInfo:nil];
+      [self->errorHandler fatalError:e];
+      return;
+    }
   }
   
   if ([_source isKindOfClass:[NSData class]]) {

diff --git a/sope-ical/versitSaxDriver/Version b/sope-ical/versitSaxDriver/Version
index c4b3e0d528e941ad4fe1bc376aecde07e3bb1200..021f6fc6c31252b0477a3d35f2d893fb2912f5b0 100644 (file)
--- a/sope-ical/versitSaxDriver/Version
+++ b/sope-ical/versitSaxDriver/Version
@@ -1,3 +1,3 @@
 # Version file
 
-SUBMINOR_VERSION:=21
+SUBMINOR_VERSION:=22