From 503ce1e6c4083ffcc467911c93c4c65274b476ce Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Mon, 3 Feb 2014 19:19:14 +0000 Subject: [PATCH] Bug 55927: Handle date types when exporting to XML git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1564011 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xssf/extractor/XSSFExportToXml.java | 13 ++++++- .../xssf/extractor/TestXSSFExportToXML.java | 33 ++++++++++++++++-- test-data/spreadsheet/55927.xlsx | Bin 0 -> 11844 bytes 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 test-data/spreadsheet/55927.xlsx diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java index aa68c26384..807a584181 100644 --- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java +++ b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java @@ -19,6 +19,8 @@ package org.apache.poi.xssf.extractor; import java.io.IOException; import java.io.OutputStream; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@ -41,6 +43,7 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; +import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFMap; import org.apache.poi.xssf.usermodel.XSSFRow; @@ -281,7 +284,14 @@ public class XSSFExportToXml implements Comparator{ case XSSFCell.CELL_TYPE_BOOLEAN: value += cell.getBooleanCellValue(); break; case XSSFCell.CELL_TYPE_ERROR: value = cell.getErrorCellString(); break; case XSSFCell.CELL_TYPE_FORMULA: value = cell.getStringCellValue(); break; - case XSSFCell.CELL_TYPE_NUMERIC: value += cell.getRawValue(); break; + case XSSFCell.CELL_TYPE_NUMERIC: + if (DateUtil.isCellDateFormatted(cell)) { + DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + value += sdf.format(cell.getDateCellValue()); + } else { + value += cell.getRawValue(); + } + break; default: ; } @@ -383,6 +393,7 @@ public class XSSFExportToXml implements Comparator{ * Compares two xpaths to define an ordering according to the XML Schema * */ + @Override public int compare(String leftXpath, String rightXpath) { int result = 0; diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java index cb70b358f8..6bcb71943f 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java @@ -52,7 +52,7 @@ public final class TestXSSFExportToXML extends TestCase { String xml = os.toString("UTF-8"); assertNotNull(xml); - assertTrue(!xml.equals("")); + assertFalse(xml.equals("")); String docente = xml.split("")[1].split("")[0].trim(); String nome = xml.split("")[1].split("")[0].trim(); @@ -95,7 +95,7 @@ public final class TestXSSFExportToXML extends TestCase { String xml = os.toString("UTF-8"); assertNotNull(xml); - assertTrue(!xml.equals("")); + assertFalse(xml.equals("")); String docente = xml.split("")[1].split("")[0].trim(); String nome = xml.split("")[1].split("")[0].trim(); @@ -199,7 +199,7 @@ public final class TestXSSFExportToXML extends TestCase { String xmlData = os.toString("UTF-8"); assertNotNull(xmlData); - assertTrue(!xmlData.equals("")); + assertFalse(xmlData.equals("")); String a = xmlData.split("")[1].split("")[0].trim(); String b = a.split("")[1].split("")[0].trim(); @@ -214,4 +214,31 @@ public final class TestXSSFExportToXML extends TestCase { assertEquals("19", chf); } } + + public void testFormulaCells_Bugzilla_55927() throws Exception { + XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55927.xlsx"); + + for (POIXMLDocumentPart p : wb.getRelations()) { + + if (!(p instanceof MapInfo)) { + continue; + } + MapInfo mapInfo = (MapInfo) p; + + XSSFMap map = mapInfo.getXSSFMapById(1); + + assertNotNull("XSSFMap is null", map); + + XSSFExportToXml exporter = new XSSFExportToXml(map); + ByteArrayOutputStream os = new ByteArrayOutputStream(); + exporter.exportToXML(os, true); + String xmlData = os.toString("UTF-8"); + + assertNotNull(xmlData); + assertFalse(xmlData.equals("")); + + String date = xmlData.split("")[1].split("")[0].trim(); + assertEquals("2012-01-13", date); + } + } } diff --git a/test-data/spreadsheet/55927.xlsx b/test-data/spreadsheet/55927.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e3d5a52cc0b44ff6edb2026614085de56f2930ba GIT binary patch literal 11844 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

WgJlIM?RgDP#ftq= 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 Q`h)_w0eL0|-OscC0mU9Q(EtDd literal 0 HcmV?d00001 -- 2.39.5