Bug 56730: Fix exporting XML if schema contains ref-elements
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1621209 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3be80a5b03
commit
67fcf46d4c
@ -448,8 +448,8 @@ public class XSSFExportToXml implements Comparator<String>{
|
|||||||
Node node = list.item(i);
|
Node node = list.item(i);
|
||||||
if (node instanceof Element) {
|
if (node instanceof Element) {
|
||||||
if (node.getLocalName().equals("element")) {
|
if (node.getLocalName().equals("element")) {
|
||||||
Node nameAttribute = node.getAttributes().getNamedItem("name");
|
Node element = getNameOrRefElement(node);
|
||||||
if (nameAttribute.getNodeValue().equals(removeNamespace(elementName))) {
|
if (element.getNodeValue().equals(removeNamespace(elementName))) {
|
||||||
indexOf = i;
|
indexOf = i;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -460,6 +460,15 @@ public class XSSFExportToXml implements Comparator<String>{
|
|||||||
return indexOf;
|
return indexOf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Node getNameOrRefElement(Node node) {
|
||||||
|
Node returnNode = node.getAttributes().getNamedItem("name");
|
||||||
|
if(returnNode != null) {
|
||||||
|
return returnNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
return node.getAttributes().getNamedItem("ref");
|
||||||
|
}
|
||||||
|
|
||||||
private Node getComplexTypeForElement(String elementName,Node xmlSchema,Node localComplexTypeRootNode) {
|
private Node getComplexTypeForElement(String elementName,Node xmlSchema,Node localComplexTypeRootNode) {
|
||||||
String elementNameWithoutNamespace = removeNamespace(elementName);
|
String elementNameWithoutNamespace = removeNamespace(elementName);
|
||||||
|
|
||||||
@ -483,7 +492,7 @@ public class XSSFExportToXml implements Comparator<String>{
|
|||||||
Node node = list.item(i);
|
Node node = list.item(i);
|
||||||
if ( node instanceof Element) {
|
if ( node instanceof Element) {
|
||||||
if (node.getLocalName().equals("element")) {
|
if (node.getLocalName().equals("element")) {
|
||||||
Node nameAttribute = node.getAttributes().getNamedItem("name");
|
Node nameAttribute = getNameOrRefElement(node);
|
||||||
if (nameAttribute.getNodeValue().equals(elementNameWithoutNamespace)) {
|
if (nameAttribute.getNodeValue().equals(elementNameWithoutNamespace)) {
|
||||||
Node complexTypeAttribute = node.getAttributes().getNamedItem("type");
|
Node complexTypeAttribute = node.getAttributes().getNamedItem("type");
|
||||||
if (complexTypeAttribute!=null) {
|
if (complexTypeAttribute!=null) {
|
||||||
@ -504,7 +513,7 @@ public class XSSFExportToXml implements Comparator<String>{
|
|||||||
Node node = complexTypeList.item(i);
|
Node node = complexTypeList.item(i);
|
||||||
if ( node instanceof Element) {
|
if ( node instanceof Element) {
|
||||||
if (node.getLocalName().equals("complexType")) {
|
if (node.getLocalName().equals("complexType")) {
|
||||||
Node nameAttribute = node.getAttributes().getNamedItem("name");
|
Node nameAttribute = getNameOrRefElement(node);
|
||||||
if (nameAttribute.getNodeValue().equals(complexTypeName)) {
|
if (nameAttribute.getNodeValue().equals(complexTypeName)) {
|
||||||
|
|
||||||
NodeList complexTypeChildList =node.getChildNodes();
|
NodeList complexTypeChildList =node.getChildNodes();
|
||||||
|
@ -49,7 +49,8 @@ import org.xml.sax.SAXException;
|
|||||||
* @author Roberto Manicardi
|
* @author Roberto Manicardi
|
||||||
*/
|
*/
|
||||||
public final class TestXSSFExportToXML extends TestCase {
|
public final class TestXSSFExportToXML extends TestCase {
|
||||||
public void testExportToXML() throws Exception {
|
|
||||||
|
public void testExportToXML() throws Exception {
|
||||||
|
|
||||||
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
|
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
|
||||||
|
|
||||||
@ -580,4 +581,37 @@ public final class TestXSSFExportToXML extends TestCase {
|
|||||||
}
|
}
|
||||||
assertTrue(found);
|
assertTrue(found);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void testRefElementsInXmlSchema_Bugzilla_56730() throws Exception {
|
||||||
|
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("56730.xlsx");
|
||||||
|
|
||||||
|
boolean found = false;
|
||||||
|
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(""));
|
||||||
|
|
||||||
|
assertEquals("2014-12-31", xmlData.split("<DATE>")[1].split("</DATE>")[0].trim());
|
||||||
|
assertEquals("12.5", xmlData.split("<REFELEMENT>")[1].split("</REFELEMENT>")[0].trim());
|
||||||
|
|
||||||
|
parseXML(xmlData);
|
||||||
|
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
assertTrue(found);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
BIN
test-data/spreadsheet/56730.xlsx
Normal file
BIN
test-data/spreadsheet/56730.xlsx
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user