Skip to content

fix readXls read null error and writexls many rows error #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qadzhang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix readXls read null error and writexls many rows error #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7592263
fix readXls read null error
qadzhang May 16, 2022
3d3de63
fix writexls When there is a lot of data or more, will report the fo…
qadzhang May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/main/java/joinery/impl/Serialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import java.util.List;
import java.util.Map;

import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFDataFormat;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
Expand Down Expand Up @@ -336,14 +337,16 @@ public static DataFrame<Object> readXls(final InputStream input)
for (final Row row : sheet) {
if (row.getRowNum() == 0) {
// read header
for (final Cell cell : row) {
columns.add(readCell(cell));
for (int i = 0; i < row.getLastCellNum(); i++) {
final Cell cell = row.getCell(i);
columns.add(cell == null ? null : readCell(cell));
}
} else {
// read data values
final List<Object> values = new ArrayList<>();
for (final Cell cell : row) {
values.add(readCell(cell));
for (int i = 0; i < row.getLastCellNum(); i++) {
final Cell cell = row.getCell(i);
values.add(cell == null ? null : readCell(cell));
}
data.add(values);
}
Expand All @@ -367,21 +370,22 @@ public static <V> void writeXls(final DataFrame<V> df, final OutputStream output
throws IOException {
final Workbook wb = new HSSFWorkbook();
final Sheet sheet = wb.createSheet();

final HSSFCellStyle dateStyle = (HSSFCellStyle) wb.createCellStyle();
dateStyle.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy h:mm"));
// add header
Row row = sheet.createRow(0);
final Iterator<Object> it = df.columns().iterator();
for (int c = 0; c < df.size(); c++) {
final Cell cell = row.createCell(c);
writeCell(cell, it.hasNext() ? it.next() : c);
writeCell(cell, it.hasNext() ? it.next() : c,dateStyle);
}

// add data values
for (int r = 0; r < df.length(); r++) {
row = sheet.createRow(r + 1);
for (int c = 0; c < df.size(); c++) {
final Cell cell = row.createCell(c);
writeCell(cell, df.get(r, c));
writeCell(cell, df.get(r, c),dateStyle);
}
}

Expand All @@ -404,13 +408,11 @@ private static final Object readCell(final Cell cell) {
}
}

private static final void writeCell(final Cell cell, final Object value) {
private static final void writeCell(final Cell cell, final Object value,final CellStyle style) {
if (value instanceof Number) {
cell.setCellType(CellType.NUMERIC);
cell.setCellValue(Number.class.cast(value).doubleValue());
} else if (value instanceof Date) {
final CellStyle style = cell.getSheet().getWorkbook().createCellStyle();
style.setDataFormat(HSSFDataFormat.getBuiltinFormat("m/d/yy h:mm"));
cell.setCellStyle(style);
cell.setCellType(CellType.NUMERIC);
cell.setCellValue(Date.class.cast(value));
Expand Down