diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-03-07 20:12:52 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-03-07 20:12:52 +0000 |
| commit | 1e5288e9840e201a00bcb5ca3035d7aa807f1f8d (patch) | |
| tree | 0c1a47953f57b71c41cc7a63e156629c6c9d645b /Source/SPExportInitializer.m | |
| parent | 915a3831525bf3a9350648d82f86dd54ae366292 (diff) | |
| download | sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.gz sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.bz2 sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.zip | |
Bring outline view branch up to date with trunk (r3203:r3224).
Diffstat (limited to 'Source/SPExportInitializer.m')
| -rw-r--r-- | Source/SPExportInitializer.m | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/SPExportInitializer.m b/Source/SPExportInitializer.m index db951b5f..f1868210 100644 --- a/Source/SPExportInitializer.m +++ b/Source/SPExportInitializer.m @@ -38,6 +38,10 @@ #import "SPSQLExporter.h" #import "SPXMLExporter.h" #import "SPDotExporter.h" +#import "SPConnectionControllerDelegateProtocol.h" +#import "SPExportFile.h" +#import "SPExportFileUtilities.h" +#import "SPExportFilenameUtilities.h" @implementation SPExportController (SPExportInitializer) @@ -174,7 +178,6 @@ */ - (void)exportTables:(NSArray *)exportTables orDataArray:(NSArray *)dataArray { - NSUInteger i; BOOL singleFileHandleSet = NO; SPExportFile *singleExportFile = nil, *file = nil; @@ -277,7 +280,7 @@ [sqlExporter setSqlExportTables:exportTables]; // Create custom filename if required - [exportFilename setString:(createCustomFilename) ? [self expandCustomFilenameFormatFromString:[exportCustomFilenameTokenField stringValue] usingTableName:nil] : [NSString stringWithFormat:@"%@_%@", [tableDocumentInstance database], [[NSDate date] descriptionWithCalendarFormat:@"%Y-%m-%d" timeZone:nil locale:nil]]]; + [exportFilename setString:(createCustomFilename) ? [self expandCustomFilenameFormatFromString:[exportCustomFilenameTokenField stringValue] usingTableName:nil] : [self generateDefaultExportFilename]]; [exportFilename setString:[exportFilename stringByAppendingPathExtension:[self currentDefaultExportFileExtension]]]; |