X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax.base%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2Fbase%2FXMLWriter.java;h=f37e4d8e2ce438094aa224f1099a2e46f8163830;hb=404be73748777cdd2d09b2f29308ae6f4a3d730c;hp=0881a5d109d3b3b56ba7e287e594da67c282078e;hpb=28cdb08c2dcc6b306d8a0cbea8c0bd791e42d583;p=simantics%2Finterop.git

diff --git a/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/XMLWriter.java b/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/XMLWriter.java
index 0881a5d..f37e4d8 100644
--- a/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/XMLWriter.java
+++ b/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/XMLWriter.java
@@ -2,7 +2,6 @@ package org.simantics.xml.sax.base;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -21,16 +20,19 @@ import org.simantics.db.Statement;
 import org.simantics.db.common.utils.ListUtils;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
 import org.simantics.message.ILogger;
 import org.simantics.xml.sax.ontology.XMLResource;
 
 public class XMLWriter {
 	
 	private ReadGraph graph;
-	private Map<String, XMLWriter> subWriters = new HashMap<String, XMLWriter>();
+	private Map<Resource, XMLWriter> subWriters = new HashMap<Resource, XMLWriter>();
 	private Map<Class<? extends XMLElementWriter>, XMLElementWriter> namedWriters = new HashMap<Class<? extends XMLElementWriter>, XMLElementWriter>();
 	private Map<Resource,XMLElementWriter> writers = new HashMap<>();
 	private String schemaURI;
+	private String ontologyURI;
+	private Resource ontology;
 	
 	private ILogger logger;
 	
@@ -38,10 +40,12 @@ public class XMLWriter {
 		return graph;
 	}
 	
-	public void setGraph(ReadGraph graph) {
+	public void setGraph(ReadGraph graph) throws DatabaseException {
 		this.graph = graph;
 		for (XMLWriter p : subWriters.values())
 			p.setGraph(graph);
+		if (ontologyURI != null)
+			this.ontology = graph.getResource(ontologyURI);
 	}
 	
 	public String getSchemaURI() {
@@ -52,6 +56,18 @@ public class XMLWriter {
 		this.schemaURI = schemaURI;
 	}
 	
+	public String getOntologyURI() {
+		return ontologyURI;
+	}
+	
+	public void setOntologyURI(String ontologyURI) {
+		this.ontologyURI = ontologyURI;
+	}
+	
+	public Resource getOntology() {
+		return ontology;
+	}
+	
 	public void add(XMLElementWriter writer) throws DatabaseException {
 		Resource type = writer.getType(graph);
 		if (type != null)
@@ -60,7 +76,7 @@ public class XMLWriter {
 	}
 	
 	public void add(XMLWriter writer) {
-		subWriters.put(writer.getSchemaURI(), writer);
+		subWriters.put(writer.getOntology(), writer);
 	}
 	
 	public void write(Resource root, XMLStreamWriter writer) throws DatabaseException, XMLStreamException {
@@ -84,7 +100,9 @@ public class XMLWriter {
 		if (graph.hasValue(instance.instance))
 			elementWriter.characters(graph, instance, writer);
 		// get all child elements
-		Collection<Statement> childElements = graph.getStatements(instance.instance, XML.hasElement);
+		Set<Statement> childElements = new HashSet<>();
+		childElements.addAll(graph.getStatements(instance.instance, XML.hasElement));
+		childElements.addAll(graph.getStatements(instance.instance, XML.hasComplexType));
 		// load elements, assign writers
 		Map<Resource,WriterElement> elementMap = new HashMap<>();
 		for (Statement s : childElements) {
@@ -104,6 +122,8 @@ public class XMLWriter {
 			if (processed.contains(r)) // badly generated writer could report elements several times. 
 				continue;
 			WriterElement child = elementMap.get(r);
+			if (child == null)
+				throw new DatabaseException("Trying to export unregonized resource " +NameUtils.getSafeName(graph, r) + " " + r);
 			write(child, writer);
 			processed.add(r);
 		}
@@ -112,6 +132,8 @@ public class XMLWriter {
 			if (processed.contains(stm.getObject()))
 				continue;
 			WriterElement child = elementMap.get(stm.getObject());
+			if (child == null)
+				throw new DatabaseException("Trying to export unregonized resource " +NameUtils.getSafeName(graph, stm.getObject()) + " " + stm.getObject());
 			write(child, writer);
 		}
 	
@@ -128,13 +150,20 @@ public class XMLWriter {
 				childWriter = this.writers.get(childWriterClass);
 				if (childWriter == null) {
 					try {
-						Constructor<? extends XMLElementWriter> c = childWriterClass.getConstructor(ReadGraph.class);
+						Constructor<? extends XMLElementWriter> c = null;
+						try {
+							c = childWriterClass.getConstructor(ReadGraph.class);
+							childWriter = c.newInstance(graph);
+						} catch (NoSuchMethodException e) {
+							c = childWriterClass.getConstructor();
+							childWriter = c.newInstance();
+						}
 						//childWriter = childWriterClass.newInstance();
-						childWriter = c.newInstance(graph);
+						
 						namedWriters.put(childWriterClass, childWriter);
 					} catch (IllegalAccessException|InstantiationException|NoSuchMethodException|SecurityException|InvocationTargetException e) {
 						String err = "Error processing " + childWriterClass.getName() + " : element writers must have accessible constructor with ReadGraph parameter";
-						logger.log(new Status(IStatus.ERROR, XMLParser.PLUGIN_ID, err));
+						logger.log(new Status(IStatus.ERROR, XMLParser.PLUGIN_ID, err, e));
 					} 
 				}
 			}
@@ -143,10 +172,30 @@ public class XMLWriter {
 			childWriter = writers.get(type);
 		}
 		if (childWriter == null) {
-			throw new DatabaseException("Cannot locate writer for " + NameUtils.getSafeName(graph, child.instance) + ", " + child.instance);
+			Resource type = graph.getSingleType(child.instance);
+			Resource ontology = getOntology(type);
+			if (ontology != null) {
+				XMLWriter xmlWriter = subWriters.get(ontology);
+				if (xmlWriter != null) {
+					childWriter = xmlWriter.writers.get(type);
+				}
+			}
+			if (childWriter == null)
+				throw new DatabaseException("Cannot locate writer for " + NameUtils.getSafeName(graph, child.instance) + ", " + child.instance);
 		}
 		child.writer = childWriter;
 		
 	}
+	
+	private Resource getOntology(Resource type) throws DatabaseException {
+		Layer0 L0 = Layer0.getInstance(graph);
+		Resource r = type;
+		while (true) {
+			r = graph.getPossibleObject(r, L0.PartOf);
+			if (r != null && graph.isInstanceOf(r, L0.Ontology))
+				break;
+		}
+		return r;
+	}
 
 }