Changeset 1299 for trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m

Timestamp:

07/05/10 17:33:37 (23 months ago)

Author:

gbooker

Message:

When upgrading, ignore parent.path and instead recompute it since previous database may be incorrect.

Files:

• trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m (modified) (1 diff)

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m

@@ -73 +73 @@
         {
                 NSString *path = [oldDir valueForKey:@"path"];
-                NSString *parentPath = [oldDir valueForKeyPath:@"parent.path"];
-                if(parentPath != nil)
+                NSString *parentPath = [path stringByDeletingLastPathComponent];
+                if(parentPath != nil && ![parentPath isEqualToString:@"/"])
                         ((SapphireDirectoryMetaData *)[lookup objectForKey:path]).parent = [lookup objectForKey:parentPath];
         }