Changeset 7671

Timestamp:

Mar 21, 2019, 1:35:39 PM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #2161: Import data from Excel files

Fixes a problem with some columns that are missing if the some rows have empty cells at the end of the line.

File:

• trunk/src/core/net/sf/basedb/util/excel/XlsxToCsvUtil.java (modified) (4 diffs)

trunk/src/core/net/sf/basedb/util/excel/XlsxToCsvUtil.java

@@ -362 +362 @@
         if (row == null || row.getPhysicalNumberOfCells() == 0) continue; // Empty row -- skip it
         minCol = Math.min(minCol, row.getFirstCellNum());
-        maxCol = Math.max(maxCol, row.getLastCellNum()); // Note! getLastCellNum() returns index of last cell+1 that contains data!
+        int maxRowCol = row.getLastCellNum(); // Note! getLastCellNum() returns index of last cell+1 that contains data!
         
         // Sometimes there are a lot of empty or otherwise unused cells to the right on each row...
@@ -369 +369 @@
         do
         {
-          maxCol--;
-          if (maxCol < 0) break;
-          Cell c = row.getCell(maxCol);
+          maxRowCol--;
+          if (maxRowCol < 0) break;
+          Cell c = row.getCell(maxRowCol);
           cellType = c == null ? CellType.BLANK : c.getCellType();
           if (cellType == CellType.FORMULA && evaluateFormulas) 
@@ -380 +380 @@
 
         // Ok, found data on this row
-        if (maxCol >= 0) lastRowWithData = rowNo;
+        if (maxRowCol >= 0) lastRowWithData = rowNo;
+        maxCol = Math.max(maxCol, maxRowCol);
       }
       this.lastRow = lastRowWithData;
@@ -586 +587 @@
         }
         out.append(rowSeparator);
-      }     
-      
+      }
       csvBytes = out.toString().getBytes(charset);
     }