svn commit: r467811 - /incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m

[torehalset]

Author: torehalset
Date: Wed Oct 25 16:34:23 2006
New Revision: 467811

URL: http://svn.apache.org/viewvc?view=rev&rev=467811
Log:
display query error

Modified:
    incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m

Modified: incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m?view=diff&rev=467811&r1=467810&r2=467811
==============================================================================
--- incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m (original)
+++ incubator/cayenne/sandbox/CocoaCayenne/CAYClient/AppController.m Wed Oct 25 
16:34:23 2006
@@ -40,10 +40,7 @@
     if(!ok)
     {
         NSLog(@"Error in commitChanges: %@", [error localizedDescription]);
-        [NSApp presentError:error modalForWindow:[NSApp keyWindow] 
-                                        delegate:self 
-                              didPresentSelector:@selector(commit:) 
-                                     contextInfo:nil];
+        [NSApp presentError:error];
     }
 }
 
@@ -84,21 +81,33 @@
         // NSLog(@"DEBUG: core data model: %@", coreDataModel);
     }
 
+    NSError *error = nil;
+    
     // prepare/refresh the galleries controller
     CAYNamedQuery *gquery = [[CAYNamedQuery alloc] init];
     [gquery setName:@"galleryQuery"];
-    NSArray *grows = [[self objectContext] performQuery:gquery];
+    NSArray *grows = [[self objectContext] performQuery:gquery error:&error];
+    [gquery release];
+    if(!grows)
+    {
+        [NSApp presentError:error];
+        return;
+    }
     [galleriesController removeObjects:[galleriesController arrangedObjects]];
     [galleriesController addObjects:grows];
-    [gquery release];
     
     // prepare/refresh the artist controller
        CAYNamedQuery *aquery = [[CAYNamedQuery alloc] init];
        [aquery setName:@"artistQuery"];
-       NSArray *arows = [[self objectContext] performQuery:aquery];
+       NSArray *arows = [[self objectContext] performQuery:aquery 
error:&error];
+       [aquery release];
+    if(!arows)
+    {
+        [NSApp presentError:error];
+        return;
+    }
        [artistsController removeObjects:[artistsController arrangedObjects]];
        [artistsController addObjects:arows];
-       [aquery release];
     
 }