Changeset 734 for branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.m

Timestamp:

01/08/09 21:03:22 (3 years ago)

Author:

gbooker

Message:

Switched the the next version of the metadata.
Fixes #264

Files:

• branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.m (modified) (3 diffs)

branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.m

@@ -246 +246 @@
 {
         NSFileManager *fm = [NSFileManager defaultManager];
-        NSString *storeFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireData"];
+        NSString *storeFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireDataV2"];
         BOOL exists = [fm fileExistsAtPath:storeFile];
-        NSString *plistFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.plist"];
-        BOOL oldExists = [fm fileExistsAtPath:plistFile];
+        BOOL oldExists = [fm fileExistsAtPath:[applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireData"]];
+        oldExists |= [fm fileExistsAtPath:[applicationSupportDir() stringByAppendingPathComponent:@"metaData.plist"]];
         return !exists && oldExists;
 }
@@ -257 +257 @@
 {
         if(storeFile == nil)
-                storeFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireData"];
+                storeFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireDataV2"];
         NSFileManager *fm = [NSFileManager defaultManager];
         [fm constructPath:[storeFile stringByDeletingLastPathComponent]];
@@ -264 +264 @@
         
         NSString *mopath = [[NSBundle bundleForClass:[self class]] pathForResource:@"Sapphire" ofType:@"momd"];
-        mopath = [mopath stringByAppendingPathComponent:@"SapphireV1.mom"];
+        mopath = [mopath stringByAppendingPathComponent:@"SapphireV2.mom"];
         NSURL *mourl = [NSURL fileURLWithPath:mopath];
         NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:mourl];