From 27eba105aef0a612e5a91af02a0b87b99b06ab78 Mon Sep 17 00:00:00 2001
From: stuconnolly <stuart02@gmail.com>
Date: Tue, 6 Oct 2009 00:44:48 +0000
Subject: More export redesign work. CSV data generation is currently working
 using the old non-streaming code, but does not yet write to any files. Please
 note that this is still very much a work in progress.

---
 Source/TableDocument.m | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'Source/TableDocument.m')

diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index b98d7d51..e8290043 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -587,18 +587,16 @@
 	[tableRelationsInstance setConnection:mySQLConnection];
 	[customQueryInstance setConnection:mySQLConnection];
 	[tableDumpInstance setConnection:mySQLConnection];
-	[spExportControllerInstance setConnection:mySQLConnection];
+	[exportControllerInstance setConnection:mySQLConnection];
 	[tableDataInstance setConnection:mySQLConnection];
 	[extendedTableInfoInstance setConnection:mySQLConnection];
 	[databaseDataInstance setConnection:mySQLConnection];
-	if (userManagerInstance == nil)
-	{
+	
+	if (!userManagerInstance) {
 		userManagerInstance = [[SPUserManager alloc] initWithConnection:mySQLConnection];
 	} 
-	else 
-	{
-		[userManagerInstance setConnection:mySQLConnection];
-	}
+
+	[userManagerInstance setConnection:mySQLConnection];
 
 	// Set the cutom query editor's MySQL version
 	[customQueryInstance setMySQLversion:mySQLVersion];
@@ -2528,11 +2526,10 @@
  */
 - (IBAction)export:(id)sender
 {
-	if ([sender tag] == -1) {
-		//[tableDumpInstance export];
-		
-		[spExportControllerInstance export];
-	} else {
+	if ([sender tag] == -1) {		
+		[exportControllerInstance export];
+	} 
+	else {
 		[tableDumpInstance exportFile:[sender tag]];
 	}
 }
-- 
cgit v1.2.3