Changeset 340

Timestamp:

Feb 9, 2010, 10:28:15 PM (14 years ago)

Author:

gav

Message:

Small adjustment to CsvService asset tree import, to handle blank description on last column correctly.

File:

• trunk/grails-app/services/CsvService.groovy (modified) (2 diffs)

trunk/grails-app/services/CsvService.groovy

@@ -42 +42 @@
 
             def columnIndex = 0
+            def nameColumnIndex = 0
             def numberOfColumns = 0
             def maxNumberOfColumns = 20
@@ -91 +92 @@
 
             def nextColumn = {
-                if( (columnIndex+2) > numberOfColumns ) {
+                nameColumnIndex = columnIndex
+
+                if( (columnIndex+1) < numberOfColumns ) {
+                    // Capitalise and assign the name and description columns.
+                    use(WordUtils) {
+                    column.name = line[columnIndex].trim().capitalize()
+                    column.description = line[++columnIndex].trim().capitalize()
+                    }
+                }
+                else if( columnIndex < numberOfColumns ) {
+                    // Capitalise and assign the name column with a blank description.
+                    use(WordUtils) {
+                    column.name = line[columnIndex].trim().capitalize()
+                    column.description = ''
+                    }
+                }
+                else {
                     log.info "No more columns on line: " + lineNumber
                     return false
                 }
-                if(!line[columnIndex]) {
-                    log.info "No name at " + "line: " + lineNumber + " col: " + columnIndex
+
+                if(!column.name) {
+                    log.info "No name at " + "line: " + lineNumber + " col: " + nameColumnIndex
                     return false
                 }
-                // Capitalise and assign the name and description columns.
-                use(WordUtils) {
-                column.name = line[columnIndex].trim().capitalize()
-                column.description = line[++columnIndex].trim().capitalize()
-                }
+
                 columnIndex++
                 // Success.