Changeset 659

Show
Ignore:
Timestamp:
08/17/08 18:19:12 (4 months ago)
Author:
gbooker
Message:

Corrected a case where import was never actually done in the background.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/CoreData/SapphireFrappliance/FRAppliance/SapphireImportHelper.m

    r616 r659  
    3030#import "SapphireMovieImporter.h" 
    3131#import "SapphireFileMetaData.h" 
     32#import "SapphireMetaDataSupport.h" 
    3233 
    3334#define CONNECTION_NAME @"Sapphire Server" 
    …… 
    156157                NSString *path = [file path]; 
    157158                SapphireFileMetaData *file = [SapphireFileMetaData fileWithPath:path inContext:moc]; 
    158                 [moc refreshObject:file mergeChanges:NO]; 
     159                [moc refreshObject:file mergeChanges:YES]; 
    159160                if(type == IMPORT_TYPE_FILE_DATA) 
    160161                        ret = updateMetaData(file); 
    …… 
    298299                return; 
    299300        queueSuspended = NO; 
    300         NSError *error = nil; 
    301         [moc save:&error]; 
     301        [SapphireMetaDataSupport save:moc]; 
    302302        [client startQueue]; 
    303303} 
    …… 
    363363                [client startQueue]; 
    364364        } 
     365        else 
     366                queueSuspended = YES; 
    365367} 
    366368 
    …… 
    372374        SapphireFileMetaData *file = [SapphireFileMetaData fileWithPath:path inContext:moc]; 
    373375        if(file != nil) 
    374                 [moc refreshObject:file mergeChanges:NO]; 
     376                [moc refreshObject:file mergeChanges:YES]; 
    375377        [[currentImporting informer] informComplete:updated]; 
    376378        [currentImporting release];