Truncate any completely empty columns on the right (#2842)

Fixes #565
The current versions of Open Office create default spreadsheets
with over 1000 empty columns. Keep track of the rightmost
non-empty column when importing and truncate everything else.

Also adds a basic ODS import test.
This commit is contained in:
Tom Morris 2020-06-30 02:19:00 -04:00 committed by GitHub
parent bc672047f6
commit 421974cc3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 138 additions and 4 deletions

View File

@ -167,6 +167,7 @@ public class OdsImporter extends TabularImportingParserBase {
List<Object> cells = new ArrayList<Object>();
OdfTableRow row = table.getRowByIndex(nextRow++);
int maxCol = 0;
if (row != null) {
int lastCell = row.getCellCount();
for (int cellIndex = 0; cellIndex <= lastCell; cellIndex++) {
@ -177,9 +178,13 @@ public class OdsImporter extends TabularImportingParserBase {
cell = extractCell(sourceCell, reconMap);
}
cells.add(cell);
if (cell != null && cellIndex > maxCol) {
maxCol = cellIndex;
}
}
}
return cells;
// Right truncate null cells
return cells.subList(0, maxCol + 1);
}
};
@ -223,10 +228,10 @@ public class OdsImporter extends TabularImportingParserBase {
if ("".equals(value)) {
value = null;
} else {
logger.info("Null cell type with non-empty value: " + value);
logger.warn("Null cell type with non-empty value: " + value);
}
} else {
logger.info("Unexpected cell type " + cellType);
logger.warn("Unexpected cell type " + cellType);
value = cell.getDisplayText();
}
return value;

View File

@ -151,7 +151,7 @@ abstract public class TabularImportingParserBase extends ImportingParserBase {
ImporterUtilities.setupColumns(project, columnNames);
}
} else { // data lines
Row row = new Row(columnNames.size());
Row row = new Row(cells.size());
if (storeBlankRows) {
rowsWithData++;

BIN
main/tests/data/films.ods Normal file

Binary file not shown.

View File

@ -0,0 +1,129 @@
/*
Copyright 2020, Thomas F. Morris
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.google.refine.importers;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.refine.model.Row;
import com.google.refine.util.ParsingUtilities;
public class OdsImporterTests extends ImporterTest {
private static final double EPSILON = 0.0000001;
private static final int ROWS = 5;
private static final int COLUMNS = 8;
@Override
@BeforeTest
public void init() {
logger = LoggerFactory.getLogger(this.getClass());
}
//System Under Test
OdsImporter SUT = null;
@Override
@BeforeMethod
public void setUp(){
super.setUp();
SUT = new OdsImporter();
}
@Override
@AfterMethod
public void tearDown(){
SUT = null;
super.tearDown();
}
@Test
public void readOds() throws FileNotFoundException, IOException{
ArrayNode sheets = ParsingUtilities.mapper.createArrayNode();
sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
whenGetArrayOption("sheets", options, sheets);
whenGetIntegerOption("ignoreLines", options, 0);
whenGetIntegerOption("headerLines", options, 1);
whenGetIntegerOption("skipDataLines", options, 0);
whenGetIntegerOption("limit", options, ROWS);
whenGetBooleanOption("storeBlankCellsAsNulls",options,true);
InputStream stream = ClassLoader.getSystemResourceAsStream("films.ods");
try {
parseOneFile(SUT, stream);
} catch (Exception e) {
Assert.fail(e.getMessage());
}
assertEquals(project.rows.size(), ROWS);
Row row = project.rows.get(0);
assertEquals(row.cells.size(), COLUMNS);
assertEquals((String)row.getCellValue(1),"2 Days In New York");
// FIXME: Dates are currently broken
// assertEquals(((OffsetDateTime)row.getCellValue(3)).toString().substring(0, 10),"2012-03-28");
assertEquals(((Number)row.getCellValue(5)).doubleValue(), 4.5, EPSILON);
assertFalse((Boolean)row.getCellValue(7));
assertTrue((Boolean)project.rows.get(1).getCellValue(7));
assertNull((String)project.rows.get(2).getCellValue(2));
verify(options, times(1)).get("ignoreLines");
verify(options, times(1)).get("headerLines");
verify(options, times(1)).get("skipDataLines");
verify(options, times(1)).get("limit");
verify(options, times(1)).get("storeBlankCellsAsNulls");
}
}