Author: centic
Date: Mon Feb 3 19:19:14 2014
New Revision: 1564011
URL: http://svn.apache.org/r1564011
Log:
Bug 55927: Handle date types when exporting to XML
Added:
poi/trunk/test-data/spreadsheet/55927.xlsx
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java?rev=1564011&r1=1564010&r2=1564011&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
Mon Feb 3 19:19:14 2014
@@ -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.SchemaFactor
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
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
* Compares two xpaths to define an ordering according to the XML Schema
*
*/
+ @Override
public int compare(String leftXpath, String rightXpath) {
int result = 0;
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java?rev=1564011&r1=1564010&r2=1564011&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
Mon Feb 3 19:19:14 2014
@@ -52,7 +52,7 @@ public final class TestXSSFExportToXML e
String xml = os.toString("UTF-8");
assertNotNull(xml);
- assertTrue(!xml.equals(""));
+ assertFalse(xml.equals(""));
String docente =
xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
String nome =
xml.split("<NOME>")[1].split("</NOME>")[0].trim();
@@ -95,7 +95,7 @@ public final class TestXSSFExportToXML e
String xml = os.toString("UTF-8");
assertNotNull(xml);
- assertTrue(!xml.equals(""));
+ assertFalse(xml.equals(""));
String docente =
xml.split("<DOCENTE>")[1].split("</DOCENTE>")[0].trim();
String nome =
xml.split("<NOME>")[1].split("</NOME>")[0].trim();
@@ -199,7 +199,7 @@ public final class TestXSSFExportToXML e
String xmlData = os.toString("UTF-8");
assertNotNull(xmlData);
- assertTrue(!xmlData.equals(""));
+ assertFalse(xmlData.equals(""));
String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
String b = a.split("<B>")[1].split("</B>")[0].trim();
@@ -214,4 +214,31 @@ public final class TestXSSFExportToXML e
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("<DATE>")[1].split("</DATE>")[0].trim();
+ assertEquals("2012-01-13", date);
+ }
+ }
}
Added: poi/trunk/test-data/spreadsheet/55927.xlsx
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/55927.xlsx?rev=1564011&view=auto
==============================================================================
Files poi/trunk/test-data/spreadsheet/55927.xlsx (added) and
poi/trunk/test-data/spreadsheet/55927.xlsx Mon Feb 3 19:19:14 2014 differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
