Changeset 874 for branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCollectionDirectory.m

Timestamp:

08/03/09 08:59:45 (3 years ago)

Author:

gbooker

Message:

Added ability to fetch all the collections which are not skipped instead of all the collections which are not hidden. Importer and Leopard File Events use non-skipped collections instead of non-hidden ones.
Fixes #292

Files:

• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCollectionDirectory.m (modified) (2 diffs)

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCollectionDirectory.m

@@ -85 +85 @@
 }
 
-+ (NSArray *)availableCollectionDirectoriesInContext:(NSManagedObjectContext *)moc
++ (NSArray *)availableCollectionDirectoriesInContext:(NSManagedObjectContext *)moc includeHiddenOverSkipped:(BOOL)hidden
 {
         NSFileManager *fm = [NSFileManager defaultManager];
@@ -130 +130 @@
         }
         
-        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(hidden == NO) AND ((manualCollection == YES) OR (directory.path IN %@))", colSet];
+        NSPredicate *predicate;
+        if(hidden)
+                predicate = [NSPredicate predicateWithFormat:@"(skip == NO) AND ((manualCollection == YES) OR (directory.path IN %@))", colSet];
+        else
+                predicate = [NSPredicate predicateWithFormat:@"(hidden == NO) AND ((manualCollection == YES) OR (directory.path IN %@))", colSet];
         NSSortDescriptor *sort = [[NSSortDescriptor alloc] initWithKey:@"directory.path" ascending:YES];
         NSArray *ret = doSortedFetchRequest(SapphireCollectionDirectoryName, moc, predicate, sort);