Show
Ignore:
Timestamp:
02/25/10 17:31:35 (2 years ago)
Author:
gbooker
Message:

Merged changes from the branch back to trunk

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/SapphireFrappliance/MetaDataImporting/SapphireXMLFileDataImporter.m

    r1019 r1179  
    9999        /*Check for XML file*/ 
    100100        BOOL xmlPathIsDir = NO; 
    101         NSString *xmlFilePath=[[path stringByDeletingPathExtension] stringByAppendingPathExtension:@"xml"]; 
     101        NSString *extLessPath = path; 
     102        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS) 
     103                extLessPath = [extLessPath stringByDeletingPathExtension]; 
     104 
     105        NSString *xmlFilePath=[extLessPath stringByAppendingPathExtension:@"xml"]; 
    102106        SapphireXMLData *xml = [metaData xmlData]; 
    103107        if(![fm fileExistsAtPath:xmlFilePath isDirectory:&xmlPathIsDir] || xmlPathIsDir)