aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Interfaces/English.lproj/DataMigrationDialog.xib518
-rw-r--r--Source/SPFieldMapperController.h4
-rw-r--r--Source/SPFieldMapperController.m13
-rw-r--r--Source/TableDump.m11
4 files changed, 513 insertions, 33 deletions
diff --git a/Interfaces/English.lproj/DataMigrationDialog.xib b/Interfaces/English.lproj/DataMigrationDialog.xib
index 23579daf..8d849dee 100644
--- a/Interfaces/English.lproj/DataMigrationDialog.xib
+++ b/Interfaces/English.lproj/DataMigrationDialog.xib
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="12"/>
+ <integer value="123"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -41,7 +41,7 @@
<object class="NSWindowTemplate" id="420604405">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{262, 438}, {465, 325}}</string>
+ <string key="NSWindowRect">{{262, 369}, {465, 394}}</string>
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">CSV Field Mapping</string>
<string key="NSWindowClass">NSWindow</string>
@@ -49,7 +49,7 @@
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
- <string key="NSWindowContentMinSize">{465, 311}</string>
+ <string key="NSWindowContentMinSize">{465, 394}</string>
<object class="NSView" key="NSWindowView" id="78582513">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
@@ -68,13 +68,13 @@
<object class="NSTextField" id="1052916804">
<reference key="NSNextResponder" ref="297364507"/>
<int key="NSvFlags">269</int>
- <string key="NSFrame">{{179, 12}, {93, 17}}</string>
+ <string key="NSFrame">{{149, 12}, {168, 17}}</string>
<reference key="NSSuperview" ref="297364507"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="922239869">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
- <string key="NSContents">Field Mapping</string>
+ <string key="NSContents">CSV Import Field Mapping</string>
<object class="NSFont" key="NSSupport" id="388072550">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
@@ -106,7 +106,7 @@
<reference key="NSSuperview" ref="617902336"/>
</object>
</object>
- <string key="NSFrame">{{-1, 285}, {467, 41}}</string>
+ <string key="NSFrame">{{-1, 354}, {467, 41}}</string>
<reference key="NSSuperview" ref="78582513"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -181,7 +181,7 @@
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
- <string key="NSContents">Source Fields</string>
+ <string key="NSContents">CSV Fields</string>
<reference key="NSSupport" ref="26"/>
<object class="NSColor" key="NSBackgroundColor" id="796399838">
<int key="NSColorSpace">3</int>
@@ -250,7 +250,7 @@
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">134219776</int>
- <string key="NSContents">→×</string>
+ <string key="NSContents"/>
<reference key="NSSupport" ref="26"/>
<reference key="NSBackgroundColor" ref="796399838"/>
<reference key="NSTextColor" ref="186205954"/>
@@ -302,7 +302,7 @@
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
- <string key="NSContents">Target Fields</string>
+ <string key="NSContents">Table Target Fields</string>
<reference key="NSSupport" ref="26"/>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
@@ -437,7 +437,7 @@
</object>
<reference ref="20192669"/>
</object>
- <string key="NSFrame">{{-1, 91}, {467, 159}}</string>
+ <string key="NSFrame">{{-1, 160}, {467, 159}}</string>
<reference key="NSSuperview" ref="78582513"/>
<reference key="NSNextKeyView" ref="929465390"/>
<int key="NSsFlags">530</int>
@@ -515,7 +515,7 @@
<string key="NSResourceName">NSGoLeftTemplate</string>
</object>
<string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
+ <string key="NSKeyEquivalent"></string>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
@@ -541,7 +541,7 @@
<string key="NSResourceName">NSGoRightTemplate</string>
</object>
<string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
+ <string key="NSKeyEquivalent"></string>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
@@ -565,7 +565,7 @@
<object class="NSPopUpButton" id="549705971">
<reference key="NSNextResponder" ref="78582513"/>
<int key="NSvFlags">267</int>
- <string key="NSFrame">{{244, 255}, {215, 22}}</string>
+ <string key="NSFrame">{{244, 324}, {215, 22}}</string>
<reference key="NSSuperview" ref="78582513"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="107647973">
@@ -597,7 +597,7 @@
<object class="NSPopUpButton" id="599385609">
<reference key="NSNextResponder" ref="78582513"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{357, 61}, {91, 22}}</string>
+ <string key="NSFrame">{{357, 130}, {91, 22}}</string>
<reference key="NSSuperview" ref="78582513"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1033308908">
@@ -662,7 +662,7 @@
<object class="NSTextField" id="228203205">
<reference key="NSNextResponder" ref="78582513"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{261, 66}, {94, 14}}</string>
+ <string key="NSFrame">{{261, 135}, {94, 14}}</string>
<reference key="NSSuperview" ref="78582513"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="869323357">
@@ -686,7 +686,7 @@
<string>NSFilenamesPboardType</string>
</object>
</object>
- <string key="NSFrame">{{5, 257}, {212, 20}}</string>
+ <string key="NSFrame">{{5, 326}, {212, 20}}</string>
<reference key="NSSuperview" ref="78582513"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPathCell" key="NSCell" id="183652084">
@@ -735,7 +735,7 @@
<object class="NSButton" id="397227507">
<reference key="NSNextResponder" ref="78582513"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{17, 64}, {188, 18}}</string>
+ <string key="NSFrame">{{17, 133}, {188, 18}}</string>
<reference key="NSSuperview" ref="78582513"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="413696615">
@@ -759,13 +759,314 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSScrollView" id="1053069492">
+ <reference key="NSNextResponder" ref="78582513"/>
+ <int key="NSvFlags">289</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSClipView" id="289958592">
+ <reference key="NSNextResponder" ref="1053069492"/>
+ <int key="NSvFlags">2304</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSTextView" id="989433642">
+ <reference key="NSNextResponder" ref="289958592"/>
+ <int key="NSvFlags">2322</int>
+ <string key="NSFrameSize">{181, 48}</string>
+ <reference key="NSSuperview" ref="289958592"/>
+ <object class="NSTextContainer" key="NSTextContainer" id="588188642">
+ <object class="NSLayoutManager" key="NSLayoutManager">
+ <object class="NSTextStorage" key="NSTextStorage">
+ <object class="NSMutableString" key="NSString">
+ <bytes key="NS.bytes">CeKGkglEbyBpbXBvcnQgZmllbGQKCcOXCURvIG5vdCBpbXBvcnQgZmllbGQKCUlOU0VSVAlJTlNFUlQg
+SU5UTyDigKYKCVJFTFBBQ0UJUkVQTEFDRSBJTlRPIOKApg</bytes>
+ </object>
+ <object class="NSMutableArray" key="NSAttributes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSDictionary">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSFont</string>
+ <string>NSParagraphStyle</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSFont">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">10</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSParagraphStyle" id="76230511">
+ <int key="NSAlignment">4</int>
+ <object class="NSArray" key="NSTabStops">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSTextTab">
+ <int key="NSType">1</int>
+ <double key="NSLocation">63</double>
+ </object>
+ <object class="NSTextTab">
+ <double key="NSLocation">70.650001525878906</double>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="NSDictionary">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSFont</string>
+ <string>NSParagraphStyle</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSFont">
+ <string key="NSName">LucidaGrande-Bold</string>
+ <double key="NSSize">10</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference ref="76230511"/>
+ </object>
+ </object>
+ <object class="NSDictionary">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSFont</string>
+ <string>NSParagraphStyle</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">10</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference ref="76230511"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableData" key="NSAttributeInfo">
+ <bytes key="NS.bytes">AQABARIAAQIWAAYCEAAHAg8AA</bytes>
+ </object>
+ <nil key="NSDelegate"/>
+ </object>
+ <object class="NSMutableArray" key="NSTextContainers">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="588188642"/>
+ </object>
+ <int key="NSLMFlags">6</int>
+ <nil key="NSDelegate"/>
+ </object>
+ <reference key="NSTextView" ref="989433642"/>
+ <double key="NSWidth">181</double>
+ <int key="NSTCFlags">1</int>
+ </object>
+ <object class="NSTextViewSharedData" key="NSSharedData">
+ <int key="NSFlags">2308</int>
+ <int key="NSTextCheckingTypes">0</int>
+ <nil key="NSMarkedAttributes"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC45MDcyNTgwOTM0AA</bytes>
+ </object>
+ <object class="NSDictionary" key="NSSelectedAttributes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSBackgroundColor</string>
+ <string>NSColor</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">selectedTextBackgroundColor</string>
+ <reference key="NSColor" ref="240513327"/>
+ </object>
+ <object class="NSColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">selectedTextColor</string>
+ <reference key="NSColor" ref="938074100"/>
+ </object>
+ </object>
+ </object>
+ <reference key="NSInsertionColor" ref="938074100"/>
+ <object class="NSDictionary" key="NSLinkAttributes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSColor</string>
+ <string>NSCursor</string>
+ <string>NSUnderline</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDEAA</bytes>
+ </object>
+ <object class="NSCursor">
+ <string key="NSHotSpot">{8, -8}</string>
+ <int key="NSCursorType">13</int>
+ </object>
+ <integer value="1"/>
+ </object>
+ </object>
+ <nil key="NSDefaultParagraphStyle"/>
+ </object>
+ <int key="NSTVFlags">6</int>
+ <string key="NSMaxSize">{463, 1e+07}</string>
+ <string key="NSMinize">{133, 36}</string>
+ <nil key="NSDelegate"/>
+ </object>
+ </object>
+ <string key="NSFrameSize">{181, 56}</string>
+ <reference key="NSSuperview" ref="1053069492"/>
+ <reference key="NSNextKeyView" ref="989433642"/>
+ <reference key="NSDocView" ref="989433642"/>
+ <object class="NSColor" key="NSBGColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC45Mjk0MTE4Mjg1IDAuOTI5NDExODI4NSAwLjkyOTQxMTgyODUAA</bytes>
+ </object>
+ <object class="NSCursor" key="NSCursor">
+ <string key="NSHotSpot">{4, 4}</string>
+ <int key="NSCursorType">0</int>
+ </object>
+ <int key="NScvFlags">6</int>
+ </object>
+ <object class="NSScroller" id="98036131">
+ <reference key="NSNextResponder" ref="1053069492"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {15, 55}}</string>
+ <reference key="NSSuperview" ref="1053069492"/>
+ <reference key="NSTarget" ref="1053069492"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.85256409645080566</double>
+ </object>
+ <object class="NSScroller" id="958026344">
+ <reference key="NSNextResponder" ref="1053069492"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
+ <reference key="NSSuperview" ref="1053069492"/>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="1053069492"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.94565218687057495</double>
+ </object>
+ </object>
+ <string key="NSFrame">{{264, 60}, {181, 56}}</string>
+ <reference key="NSSuperview" ref="78582513"/>
+ <reference key="NSNextKeyView" ref="289958592"/>
+ <int key="NSsFlags">512</int>
+ <reference key="NSVScroller" ref="98036131"/>
+ <reference key="NSHScroller" ref="958026344"/>
+ <reference key="NSContentView" ref="289958592"/>
+ </object>
+ <object class="NSPopUpButton" id="573115956">
+ <reference key="NSNextResponder" ref="78582513"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{17, 84}, {161, 22}}</string>
+ <reference key="NSSuperview" ref="78582513"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSPopUpButtonCell" key="NSCell" id="940205369">
+ <int key="NSCellFlags">-1539178944</int>
+ <int key="NSCellFlags2">133120</int>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="573115956"/>
+ <int key="NSButtonFlags">109199615</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ <object class="NSMenuItem" key="NSMenuItem" id="863046035">
+ <reference key="NSMenu" ref="877368345"/>
+ <string key="NSTitle">matching names</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <int key="NSState">1</int>
+ <reference key="NSOnImage" ref="884724275"/>
+ <reference key="NSMixedImage" ref="1071040955"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="940205369"/>
+ </object>
+ <bool key="NSMenuItemRespectAlignment">YES</bool>
+ <object class="NSMenu" key="NSMenu" id="877368345">
+ <string key="NSTitle">OtherViews</string>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="863046035"/>
+ <object class="NSMenuItem" id="288483296">
+ <reference key="NSMenu" ref="877368345"/>
+ <string key="NSTitle">file order</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="884724275"/>
+ <reference key="NSMixedImage" ref="1071040955"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="940205369"/>
+ </object>
+ </object>
+ <reference key="NSMenuFont" ref="388072550"/>
+ </object>
+ <int key="NSPreferredEdge">1</int>
+ <bool key="NSUsesItemFromMenu">YES</bool>
+ <bool key="NSAltersState">YES</bool>
+ <int key="NSArrowPosition">2</int>
+ </object>
+ </object>
+ <object class="NSTextField" id="155260473">
+ <reference key="NSNextResponder" ref="78582513"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{19, 107}, {117, 14}}</string>
+ <reference key="NSSuperview" ref="78582513"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="498123343">
+ <int key="NSCellFlags">68288064</int>
+ <int key="NSCellFlags2">272761856</int>
+ <string key="NSContents">Align field names by:</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="155260473"/>
+ <reference key="NSBackgroundColor" ref="19028295"/>
+ <reference key="NSTextColor" ref="263116164"/>
+ </object>
+ </object>
+ <object class="NSButton" id="42651750">
+ <reference key="NSNextResponder" ref="78582513"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 59}, {155, 17}}</string>
+ <reference key="NSSuperview" ref="78582513"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="1001034034">
+ <int key="NSCellFlags">-1543373312</int>
+ <int key="NSCellFlags2">134348800</int>
+ <string key="NSContents">Add global import value</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="42651750"/>
+ <int key="NSButtonFlags">-2038152961</int>
+ <int key="NSButtonFlags2">164</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ </object>
</object>
- <string key="NSFrameSize">{465, 325}</string>
+ <string key="NSFrameSize">{465, 394}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
- <string key="NSMinSize">{465, 333}</string>
+ <string key="NSMinSize">{465, 416}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSFrameAutosaveName">SPCSVFieldMappingSheet</string>
</object>
<object class="NSUserDefaultsController" id="443551699">
<bool key="NSSharedInstance">YES</bool>
@@ -973,6 +1274,10 @@
<reference ref="599385609"/>
<reference ref="228203205"/>
<reference ref="397227507"/>
+ <reference ref="1053069492"/>
+ <reference ref="573115956"/>
+ <reference ref="155260473"/>
+ <reference ref="42651750"/>
</object>
<reference key="parent" ref="420604405"/>
</object>
@@ -1317,6 +1622,98 @@
<reference key="object" ref="413696615"/>
<reference key="parent" ref="397227507"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">123</int>
+ <reference key="object" ref="1053069492"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="98036131"/>
+ <reference ref="958026344"/>
+ <reference ref="989433642"/>
+ </object>
+ <reference key="parent" ref="78582513"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">124</int>
+ <reference key="object" ref="98036131"/>
+ <reference key="parent" ref="1053069492"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">125</int>
+ <reference key="object" ref="958026344"/>
+ <reference key="parent" ref="1053069492"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">126</int>
+ <reference key="object" ref="989433642"/>
+ <reference key="parent" ref="1053069492"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">131</int>
+ <reference key="object" ref="573115956"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="940205369"/>
+ </object>
+ <reference key="parent" ref="78582513"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">132</int>
+ <reference key="object" ref="940205369"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="877368345"/>
+ </object>
+ <reference key="parent" ref="573115956"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">133</int>
+ <reference key="object" ref="877368345"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="863046035"/>
+ <reference ref="288483296"/>
+ </object>
+ <reference key="parent" ref="940205369"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">134</int>
+ <reference key="object" ref="863046035"/>
+ <reference key="parent" ref="877368345"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">135</int>
+ <reference key="object" ref="288483296"/>
+ <reference key="parent" ref="877368345"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">137</int>
+ <reference key="object" ref="155260473"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="498123343"/>
+ </object>
+ <reference key="parent" ref="78582513"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">138</int>
+ <reference key="object" ref="498123343"/>
+ <reference key="parent" ref="155260473"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">139</int>
+ <reference key="object" ref="42651750"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1001034034"/>
+ </object>
+ <reference key="parent" ref="78582513"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">140</int>
+ <reference key="object" ref="1001034034"/>
+ <reference key="parent" ref="42651750"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1337,15 +1734,34 @@
<string>112.IBPluginDependency</string>
<string>12.IBPluginDependency</string>
<string>12.ImportedFromIB2</string>
+ <string>123.IBPluginDependency</string>
+ <string>124.IBPluginDependency</string>
+ <string>125.IBPluginDependency</string>
+ <string>126.IBPluginDependency</string>
<string>13.IBPluginDependency</string>
<string>13.ImportedFromIB2</string>
+ <string>131.IBPluginDependency</string>
+ <string>132.IBPluginDependency</string>
+ <string>133.IBEditorWindowLastContentRect</string>
+ <string>133.IBPluginDependency</string>
+ <string>134.IBPluginDependency</string>
+ <string>135.IBPluginDependency</string>
+ <string>137.IBPluginDependency</string>
+ <string>138.IBPluginDependency</string>
+ <string>139.IBAttributePlaceholdersKey</string>
+ <string>139.IBPluginDependency</string>
<string>14.IBPluginDependency</string>
+ <string>140.IBPluginDependency</string>
+ <string>15.IBAttributePlaceholdersKey</string>
<string>15.IBPluginDependency</string>
<string>15.ImportedFromIB2</string>
+ <string>16.IBAttributePlaceholdersKey</string>
<string>16.IBPluginDependency</string>
<string>16.ImportedFromIB2</string>
+ <string>17.IBAttributePlaceholdersKey</string>
<string>17.IBPluginDependency</string>
<string>17.ImportedFromIB2</string>
+ <string>18.IBAttributePlaceholdersKey</string>
<string>18.IBPluginDependency</string>
<string>18.ImportedFromIB2</string>
<string>19.IBPluginDependency</string>
@@ -1399,28 +1815,82 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{180, 351}, {465, 325}}</string>
+ <string>{{180, 282}, {465, 394}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{180, 351}, {465, 325}}</string>
+ <string>{{180, 282}, {465, 394}}</string>
<integer value="1"/>
<string>{{387, 725}, {432, 282}}</string>
<integer value="0"/>
<integer value="1"/>
<string>{3.40282e+38, 3.40282e+38}</string>
- <string>{465, 311}</string>
+ <string>{465, 394}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{186, 347}, {150, 37}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSMutableDictionary">
+ <string key="NS.key.0">ToolTip</string>
+ <object class="IBToolTipAttribute" key="NS.object.0">
+ <string key="name">ToolTip</string>
+ <reference key="object" ref="42651750"/>
+ <string key="toolTip">(⌥⌘A)</string>
+ </object>
+ </object>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSMutableDictionary">
+ <string key="NS.key.0">ToolTip</string>
+ <object class="IBToolTipAttribute" key="NS.object.0">
+ <string key="name">ToolTip</string>
+ <reference key="object" ref="341819846"/>
+ <string type="base64-UTF8" key="toolTip">KBLihqkpA</string>
+ </object>
+ </object>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
+ <object class="NSMutableDictionary">
+ <string key="NS.key.0">ToolTip</string>
+ <object class="IBToolTipAttribute" key="NS.object.0">
+ <string key="name">ToolTip</string>
+ <reference key="object" ref="920273776"/>
+ <string type="base64-UTF8" key="toolTip">KA/ijospA</string>
+ </object>
+ </object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
+ <object class="NSMutableDictionary">
+ <string key="NS.key.0">ToolTip</string>
+ <object class="IBToolTipAttribute" key="NS.object.0">
+ <string key="name">ToolTip</string>
+ <reference key="object" ref="834757891"/>
+ <string key="toolTip">(←)</string>
+ </object>
+ </object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
+ <object class="NSMutableDictionary">
+ <string key="NS.key.0">ToolTip</string>
+ <object class="IBToolTipAttribute" key="NS.object.0">
+ <string key="name">ToolTip</string>
+ <reference key="object" ref="116285743"/>
+ <string key="toolTip">(→)</string>
+ </object>
+ </object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1459,7 +1929,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{128, 372}, {465, 20}}</string>
+ <string>{{169, 564}, {465, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1488,7 +1958,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">119</int>
+ <int key="maxID">140</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h
index 19cf316a..6fc58c60 100644
--- a/Source/SPFieldMapperController.h
+++ b/Source/SPFieldMapperController.h
@@ -27,7 +27,7 @@
@interface SPFieldMapperController : NSWindowController {
- IBOutlet id fieldMapperTableView;
+ IBOutlet NSTableView *fieldMapperTableView;
IBOutlet id tableTargetPopup;
IBOutlet NSPathControl *fileSourcePath;
IBOutlet id importMethodPopup;
@@ -68,7 +68,7 @@
- (id)initWithDelegate:(id)managerDelegate;
- (void)setConnection:(MCPConnection *)theConnection;
-- (void)setImportDataArray:(id)theFieldMappingImportArray hasHeader:(BOOL)hasHeader;
+- (void)setImportDataArray:(id)theFieldMappingImportArray hasHeader:(BOOL)hasHeader isPreview:(BOOL)isPreview;
// Getter methods
- (NSString*)selectedTableTarget;
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index 8dc06d87..f7a2e068 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -119,10 +119,11 @@
[mySQLConnection retain];
}
-- (void)setImportDataArray:(id)theFieldMappingImportArray hasHeader:(BOOL)hasHeader
+- (void)setImportDataArray:(id)theFieldMappingImportArray hasHeader:(BOOL)hasHeader isPreview:(BOOL)isPreview
{
fieldMappingImportArray = theFieldMappingImportArray;
importFieldNamesHeader = hasHeader;
+ fieldMappingImportArrayIsPreview = isPreview;
}
#pragma mark -
@@ -327,8 +328,16 @@
&& [fieldMappingTableColumnNames count]) {
NSInteger i;
NSNumber *globalValue = doImport;
- if([fieldMappingOperatorArray objectAtIndex:0] == doImport)
+ if([fieldMappingOperatorArray objectAtIndex:0] == doImport) {
globalValue = doNotImport;
+ // NSTextFieldCell *c = [[[NSTextFieldCell alloc] init] autorelease];
+ // [c setStringValue:doNotImportString];
+ // [aTableColumn setHeaderCell:c];
+ } else {
+ // NSTextFieldCell *c = [[[NSTextFieldCell alloc] init] autorelease];
+ // [c setStringValue:doImportString];
+ // [aTableColumn setHeaderCell:c];
+ }
[fieldMappingOperatorArray removeAllObjects];
for(i=0; i < [fieldMappingTableColumnNames count]; i++)
[fieldMappingOperatorArray addObject:globalValue];
diff --git a/Source/TableDump.m b/Source/TableDump.m
index 33118738..9e42e105 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -1041,7 +1041,8 @@
[csvDataBuffer release];
[parsedRows release];
[parsePositions release];
- fieldMappingArray = nil;
+ if(fieldMappingArray) [fieldMappingArray release]; fieldMappingArray = nil;
+ if(fieldMapperOperator) [fieldMapperOperator release]; fieldMapperOperator = nil;
[importPool drain];
[tableDocumentInstance setQueryMode:SPInterfaceQueryMode];
@@ -1157,7 +1158,7 @@
fieldMapperController = [[SPFieldMapperController alloc] initWithDelegate:self];
[fieldMapperController setConnection:mySQLConnection];
[fieldMapperController setSourcePath:filename];
- [fieldMapperController setImportDataArray:fieldMappingImportArray hasHeader:[importFieldNamesSwitch state]];
+ [fieldMapperController setImportDataArray:fieldMappingImportArray hasHeader:[importFieldNamesSwitch state] isPreview:fieldMappingImportArrayIsPreview];
// Show field mapper sheet and set the focus to it
[NSApp beginSheet:[fieldMapperController window]
@@ -1173,8 +1174,8 @@
usleep(100000);
// Get mapping settings
- fieldMapperOperator = [NSArray arrayWithArray:[fieldMapperController fieldMapperOperator]];
- fieldMappingArray = [NSArray arrayWithArray:[fieldMapperController fieldMappingArray]];
+ fieldMapperOperator = [[NSArray arrayWithArray:[fieldMapperController fieldMapperOperator]] retain];
+ fieldMappingArray = [[NSArray arrayWithArray:[fieldMapperController fieldMappingArray]] retain];
selectedTableTarget = [NSString stringWithString:[fieldMapperController selectedTableTarget]];
selectedImportMethod = [NSString stringWithString:[fieldMapperController selectedImportMethod]];
fieldMappingTableColumnNames = [NSArray arrayWithArray:[fieldMapperController fieldMappingTableColumnNames]];
@@ -2811,7 +2812,7 @@
- (IBAction)cancelProgressBar:(id)sender
{
- progressCancelled = YES;
+ progressCancelled = YES;
}
- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar