[TWiki-Dev] [SVN] SvenDowideit r17199 - in twiki/trunk/ExcelImportExportPlugin: data/Sandbox lib/TWiki/Plugins/ExcelImportExportPlugin

[<de...@de...>]

Author: SvenDowideit
Date: 2008-07-29 00:33:40 -0500 (Tue, 29 Jul 2008)
New Revision: 17199
Trac url: http://develop.twiki.org/trac/changeset/17199

Modified:
   twiki/trunk/ExcelImportExportPlugin/data/Sandbox/IssueExcelExportImport.txt
   twiki/trunk/ExcelImportExportPlugin/lib/TWiki/Plugins/ExcelImportExportPlugin/Export.pm
Log:
Item5837: use TOPICTEXT _only_ lets try to avoid mixing the 2 up in future

Modified: twiki/trunk/ExcelImportExportPlugin/data/Sandbox/IssueExcelExportImport.txt
===================================================================
--- twiki/trunk/ExcelImportExportPlugin/data/Sandbox/IssueExcelExportImport.txt	2008-07-29 05:26:35 UTC (rev 17198)
+++ twiki/trunk/ExcelImportExportPlugin/data/Sandbox/IssueExcelExportImport.txt	2008-07-29 05:33:40 UTC (rev 17199)
@@ -28,7 +28,7 @@
 
 	* Set FORM = IssueTrackingForm 
 	* Set DEBUG = 0
-	* Set TEXTTOPIC = TEXT
+	* Set TOPICTEXT = TEXT
 	* Set TOPICCOLUMN = TOPIC
 
 ---+++ Import Settings

Modified: twiki/trunk/ExcelImportExportPlugin/lib/TWiki/Plugins/ExcelImportExportPlugin/Export.pm
===================================================================
--- twiki/trunk/ExcelImportExportPlugin/lib/TWiki/Plugins/ExcelImportExportPlugin/Export.pm	2008-07-29 05:26:35 UTC (rev 17198)
+++ twiki/trunk/ExcelImportExportPlugin/lib/TWiki/Plugins/ExcelImportExportPlugin/Export.pm	2008-07-29 05:33:40 UTC (rev 17199)
@@ -46,7 +46,7 @@
     my %config = (
         VERTICALCOLWIDTH =>
           2.66,    # width of a column that is turn by 90 degree, i.e. one line
-        TEXTTOPIC      => "TEXT",
+        TOPICTEXT      => "TEXT",
         LINECOLUMN     => "Line",
         DEBUG          => 0,
         TOPICCOLUMN    => "TOPIC",
@@ -169,6 +169,8 @@
         }
 
     }
+    push( @sortorder, $config{TOPICTEXT} );
+    push( @sortorder, $config{TOPICCOLUMN} );
 
     # Read in the mapping data to configure the upload fields (if present)
     if ( $config{MAPPING} ) {
@@ -305,7 +307,7 @@
             {    # Exclude the template topcic
                 my %value;
                 $value{ $config{TOPICCOLUMN} } = $topic;
-                $value{ $config{TEXTTOPIC} } =
+                $value{ $config{TOPICTEXT} } =
                   $text;    # capture the raw text without metadata
                 $value{ $config{LINECOLUMN} } = $row;
                 foreach my $field ( @{ $meta->{'FIELD'} } )
@@ -403,7 +405,7 @@
     my %config = (
         VERTICALCOLWIDTH =>
           2.66,    # width of a column that is turn by 90 degree, i.e. one line
-        TEXTTOPIC      => "TEXT",
+        TOPICTEXT      => "TEXT",
         LINECOLUMN     => "Line",
         DEBUG          => 0,
         TOPICCOLUMN    => "TOPIC",