X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FOntologyGenerator.java;h=3aea73436367a3ab596f94a5e9854f83c3bb8dc5;hb=HEAD;hp=6e4355876ff4c7f58e5a38162fdec8db4e3dac78;hpb=7f59891d2747280b09e77bc833bc70e05eece706;p=simantics%2Finterop.git

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
index 6e43558..3aea734 100644
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
@@ -3,7 +3,9 @@ package org.simantics.xml.sax;
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.ArrayList;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -12,7 +14,6 @@ import javax.xml.namespace.QName;
 
 import org.simantics.utils.datastructures.BijectionMap;
 import org.simantics.xml.sax.SchemaConversionBase.Inheritance;
-import org.simantics.xml.sax.SchemaConversionBase.InheritanceType;
 import org.simantics.xml.sax.SchemaConversionBase.RefType;
 import org.simantics.xml.sax.SchemaObject.ObjectType;
 import org.simantics.xml.sax.configuration.AttributeComposition;
@@ -25,7 +26,6 @@ import org.w3._2001.xmlschema.LocalComplexType;
 import org.w3._2001.xmlschema.LocalSimpleType;
 import org.w3._2001.xmlschema.NamedAttributeGroup;
 import org.w3._2001.xmlschema.NamedGroup;
-import org.w3._2001.xmlschema.Restriction;
 import org.w3._2001.xmlschema.Schema;
 import org.w3._2001.xmlschema.SimpleType;
 
@@ -89,32 +89,55 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		writer.println();
 		writer.println();
 		
+		Set<SchemaConverter> children = new HashSet<>();
+		Deque<SchemaConverter> stack = new ArrayDeque<>();
+		stack.addAll(converter.getSubConverters());
+		while (!stack.isEmpty()) {
+			SchemaConverter sc = stack.pop();
+			if (children.contains(sc))
+				continue;
+			children.add(sc);
+			stack.addAll(sc.getSubConverters());
+		}
+		children.remove(converter);
+		for (SchemaConverter sc : children) {
+			writer.println(sc.shortName + " = <" + sc.ontologyUri +">");
+		}
+		
+		writer.println();
+		
 		ontRoot += ".";
+		writer.println(ontRoot+"SimpleTypes : L0.Library");
 		writer.println(ontRoot+"ComplexTypes : L0.Library");
 		writer.println(ontRoot+"AttributeGroups : L0.Library");
 		writer.println();
 		writer.println(commentTag + " Interpreted from schema");
 		writer.println();
+		
+		
 			
 		base.handle(this);
 	}
 		
-	protected String getType(QName qtype) {
+	protected String getType(QName qtype, String rel) {
 		String ontType = base.getL0TypeFromPrimitiveType(qtype);
 		if (ontType != null)
 			return ontType;
-		else if (base.isComplexTypeRef(qtype.getLocalPart()))
-			return ontRoot+getComplexTypePrefix()+qtype.getLocalPart();
-		else if (base.isSimpleTypeRef(qtype.getLocalPart()))
-			return ontRoot+qtype.getLocalPart();
-		else if (base.isElementRef(qtype.getLocalPart()))
-			return ontRoot+qtype.getLocalPart();
-		else if (qtype.getPrefix() != null && qtype.getPrefix().length() > 0) {
-			return ontRoot+qtype.getPrefix()+qtype.getLocalPart();
+		else {
+			if (base.isComplexTypeRef(qtype.getLocalPart()))
+				return getName(base.getComplexType(qtype), rel);
+			else if (base.isSimpleTypeRef(qtype.getLocalPart()))
+				return getName(base.getSimpleType(qtype), rel);
+			else if (base.isElementRef(qtype.getLocalPart()))
+				return getName(base.getElement(qtype), rel);
 		}
 		throw new RuntimeException("Reference to unknown type " + qtype.getLocalPart());
 	}
 	
+	public String getSimpleTypePrefix() {
+		return "SimpleTypes.";
+	}
+	
 	public String getComplexTypePrefix() {
 		return "ComplexTypes.";
 	}
@@ -123,7 +146,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		return "AttributeGroups.";
 	}
 	
-	public void handleChoice(SchemaObject parent, SchemaElement indicator, java.util.List<SchemaElement> elements, String name) {
+	public String handleChoice(SchemaObject parent, SchemaElement indicator, java.util.List<SchemaElement> elements, String name) {
 		boolean single = true;
 		for (SchemaElement e : elements) {
 			if (e.getRestriction().many()) {
@@ -133,70 +156,24 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		}
 		String relationName = getName(parent)+".has"+name;
 		writer.print(relationName);
-		
-		List<String> types = new ArrayList<String>();
-		for (SchemaElement e : elements) {
-			Element localElement = e.getElement();
-			QName refType = null;
-			String type = null;
-			
-			if (localElement.getName() != null) {
-				refType = localElement.getType();
-				type = base.getL0TypeFromPrimitiveType(refType);	
-			} else if (localElement.getRef() != null) {
-				refType = localElement.getRef();
-				type = base.getL0TypeFromPrimitiveType(refType);
-			}
-			if (type == null) {
-				SchemaObject obj = base.getWithName(refType);
-				types.add(getName(obj,"has"));
-			} 
-		}
-		if (types.size() > 0) {
-			for (String type : types) {
-				writer.print(" <R " + type);
-			}
-		} else {
-			writer.print(" <R XML.hasElement");
-		}
-		
+		writer.print(" <R XML.hasElement");
 		writer.println();
 		
-		for (SchemaElement e : elements) {
-			Element localElement = e.getElement();
-			QName refType = null;
-			String type = null;
-			if (localElement.getName() != null) {
-				refType = localElement.getType();
-				type = getType(refType);	
-			} else if (localElement.getRef() != null) {
-				refType = localElement.getRef();
-				type = getType(refType);
-			}
-			if (type != null) {
-				writer.println("   --> " + type);
-			}
-		}
 		if (!single) {
-			writer.println(ontRoot+name+ "List <T XML.ElementList");
-			if (types.size() == 0) {
-			writer.println(relationName+ "List <R XML.hasElementList : L0.FunctionalRelation");
-			} else {
-				writer.print(relationName+ "List");
-				for (String type : types) {
-					writer.print(" <R " + type+"List");
-				}
-				writer.println(" : L0.FunctionalRelation");
-			}
-			writer.println("   --> " + ontRoot+name+"List");
+			String elementListType = getName(parent) + "." + name + "_List";
+			writer.println(elementListType + " <T XML.ElementList");
+			writer.println(relationName + "_List <R XML.hasElementList : L0.FunctionalRelation");
+			writer.println("   --> " + elementListType);
 		}
+		
+		return relationName;
 	};
 	
 	
 	
 	@Override
-	public void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType refType) {
-		if (refType != refType.Element) {
+	public void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType refType, String baseRelationName) {
+		if (refType != RefType.Element) {
 			QName referenceType = null;
 			if (refType == RefType.Type) {
 				referenceType = element.getElement().getType();
@@ -207,28 +184,30 @@ public class OntologyGenerator implements SchemaConversionComponent {
 			} else {
 				referenceType = element.getElement().getRef();
 				if (refName == null)
-					refName = referenceType.getLocalPart();
+					refName = base.getName(referenceType);
 			}
 			String type = base.getL0TypeFromPrimitiveType(referenceType);
 			SchemaObject obj = null;
 			if (type == null) {
 				obj = base.getWithName(referenceType);
-				
-				writer.println(getName(parent)+".has"+refName + " <R " +  getName(obj,"has"));
-				writer.println("   --> " + getName(obj));
+				writer.print(getName(parent)+".has"+refName + " <R XML.hasElement <R " +  getName(obj,"has"));
+				if (baseRelationName != null) writer.print(" <R " + baseRelationName);
+				writer.println();
 			} else {
-				writer.println(getName(parent)+".has"+refName + " <R XML.hasElement");
-				writer.println("   --> " + getType(referenceType));
+				writer.print(getName(parent)+".has"+refName + " <R XML.hasElement");
+				if (baseRelationName != null) writer.print(" <R " + baseRelationName);
+				writer.println();
+				writer.println("   --> " + getType(referenceType, ""));
 			}
 			
 			if (base.useElementList(parent, indicator,element, refType == RefType.Reference, refName, referenceType)) {
 				
 				if (type == null) {
 					writer.println(getName(parent)+"."+refName + "List <T XML.ElementList");
-					writer.println(getName(parent)+".has"+refName + "List <R " +  getName(obj,"has")+"List : L0.FunctionalRelation");
+					writer.println(getName(parent)+".has"+refName + "_List <R " +  getName(obj,"has")+"_List : L0.FunctionalRelation");
 				} else {
-					writer.println(getName(parent)+"."+refName + "List <T XML.ElementList");
-					writer.println(getName(parent)+".has"+refName + "List <R XML.hasElementList : L0.FunctionalRelation");	
+					writer.println(getName(parent)+"."+refName + "_List <T XML.ElementList");
+					writer.println(getName(parent)+".has"+refName + "_List <R XML.hasElementList : L0.FunctionalRelation");	
 				}
 			}
 		} else {
@@ -237,11 +216,13 @@ public class OntologyGenerator implements SchemaConversionComponent {
 			if (refName == null)
 				refName = obj.getName();
 			
-			writer.println(getName(parent)+".has"+refName + " <R " + getName(obj,"has"));
+			writer.print(getName(parent)+".has"+refName + " <R " + getName(obj,"has"));
+			if (baseRelationName != null) writer.print(" <R " + baseRelationName);
+			writer.println();
 			writer.println("   --> " + getName(obj));
 			if (base.useElementList(parent, indicator,element, false, refName, new QName(obj.getName()))) {
-				writer.println(getName(parent)+"."+refName + "List <T XML.ElementList");
-				writer.println(getName(parent)+".has"+refName + "List <R " +  getName(obj,"has")+"List : L0.FunctionalRelation");
+				writer.println(getName(parent)+"."+refName + "_List <T XML.ElementList");
+				writer.println(getName(parent)+".has"+refName + "_List <R " +  getName(obj,"has")+"_List : L0.FunctionalRelation");
 			}
 		}
 		
@@ -260,7 +241,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		
 	@Override
 	public void handle(SchemaObject parent, Attribute attribute) {
-		String name = attribute.getName();
+		String name = base.getName(attribute);
 		QName primitiveType = attribute.getType();
 		LocalSimpleType simpleType = attribute.getSimpleType();
 		QName ref = attribute.getRef();
@@ -274,8 +255,8 @@ public class OntologyGenerator implements SchemaConversionComponent {
 			relationType = "XML.hasAttribute";
 		}
 		else if (ref != null && parent != null) {
-			relationName = getName(parent)+".has"+ref.getLocalPart();
-			relationType = ontRoot+"has"+ref.getLocalPart();
+			relationName = getName(parent)+".has"+base.getName(ref);
+			relationType = converter.getShortName(ref.getNamespaceURI())+".has"+base.getName(ref);
 		} else {
 			throw new RuntimeException();
 		}
@@ -315,7 +296,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		} else if (ontType != null) {
 			writer.println("   --> " + ontType);
 		} else if (primitiveType != null) {
-			writer.println("   <R "+ontRoot+"has"+primitiveType.getLocalPart());
+			writer.println("   <R " + getType(primitiveType, "has"));
 		}
 	}
 	
@@ -333,7 +314,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		if (parent == null) {
 			NamedAttributeGroup group = (NamedAttributeGroup)attributeGroup;
 			writer.println(ontRoot+getAttributeGroupPrefix()+group.getName()+ " <T XML.AttributeGroup");
-			SchemaObject obj = new SchemaObject(parent,attributeGroup);
+			SchemaObject obj = new SchemaObject(base,parent,attributeGroup);
 			for (Annotated annotated : group.getAttributeOrAttributeGroup()) {
 				if (annotated instanceof Attribute) {
 					//handle(getAttributeGroupPrefix()+group.getName(),(Attribute)annotated);
@@ -344,7 +325,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
 				}
 			}
 		} else {
-			writer.println(getName(parent) +" L0.Inherits " + ontRoot + getAttributeGroupPrefix() + attributeGroup.getRef().getLocalPart());
+			writer.println(getName(parent) +" L0.Inherits " + ontRoot + getAttributeGroupPrefix() + base.getName(attributeGroup.getRef()));
 		}
 		
 	}
@@ -366,26 +347,19 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		org.w3._2001.xmlschema.List list = simpleType.getList();
 		if (list != null) {
 			// TODO : process restriction in lists
-			String relationName = ontRoot+"has"+name;
-			if (parent != null)
-				relationName = getName(parent)+".has"+name;
+			String relationName = getName(simpleTypeObj, "has");
 			writer.println(relationName+ " <R XML.hasAttribute : L0.FunctionalRelation");
 			
 			String ontType = base.getL0Type(new QName(SchemaConversionBase.SCHEMA_NS, "string"));
 			writer.println("   --> " + ontType);
 		} else {
-			String relationName = ontRoot+"has"+name;
-			if (parent != null)
-				relationName = getName(parent)+".has"+name;
+			QName base = this.base.getSimpleTypeBase(simpleType);
+			writer.println(getName(simpleTypeObj) + " <T " + getType(base, ""));
 			
-			writer.println(relationName+ " <R XML.hasAttribute : L0.FunctionalRelation");
+			String relationName = getName(simpleTypeObj, "has");
 			
-			QName base = this.base.getSimpleTypeBase(simpleType);
-			Inheritance inheritance = new Inheritance("");
-			this.base.getAtomicTypeInheritance(base, inheritance);
-			if (inheritance.atomicType == null)
-				throw new RuntimeException("Could not locate atomic type for SimpleType " + simpleType.getName());
-			writer.println("   --> " + inheritance.atomicType.l0Type);
+			writer.println(relationName+ " : L0.FunctionalRelation");
+			writer.println("   --> " + getName(simpleTypeObj));
 			
 //			Restriction restriction = simpleType.getRestriction();
 //			if (restriction != null) {
@@ -444,13 +418,6 @@ public class OntologyGenerator implements SchemaConversionComponent {
 //		if (topLevelComplexType.getName().equals("Reference"))
 //			System.out.println();
 		
-		String relationName = getName(topLevelComplexType,"has");//ontRoot+"has"+name;
-		
-		writer.println(relationName+ " <R XML.hasComplexType");
-		writer.println(relationName+ "List <R XML.hasElementList");
-		//writer.println("   --> " + ontRoot+getComplexTypePrefix()+name);
-		writer.println("   --> " + name);
-		writer.println();
 //		String baseType = "XML.ComplexType";
 //
 //		QName base = getComplexTypeBase(topLevelComplexType.getComplexType());
@@ -465,11 +432,25 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		
 //		writer.println(name+ " <T "+baseType);
 		
-		if(inheritance.type == InheritanceType.AtomicType) {
-			writer.println(name+ " <T "+inheritance.baseClass + " <T "+inheritance.atomicType.l0Type);
-		} else {
-			writer.println(name+ " <T "+inheritance.baseClass);
+		// Type definition
+		if (inheritance.additionalClass != null) {
+		writer.println(name+ " <T " + inheritance.baseClass + " <T " + inheritance.additionalClass);
+	    } else if (inheritance.atomicType != null){
+	    writer.println(name+ " <T " + inheritance.baseClass + " <T " + inheritance.atomicType.l0Type);
+	    } else {
+		writer.println(name+ " <T " + inheritance.baseClass);
 		}
+		writer.println(name + "_List <T XML.ElementList");
+		
+		// Access relations
+		String relationName = getName(topLevelComplexType,"has");
+		writer.println(relationName+ " <R XML.hasComplexType");
+		writer.println("   --> " + name);
+		writer.println(relationName+ "_List <R XML.hasElementList");
+		writer.println("   --> " + name + "_List");
+		writer.println();
+		
+		// Attributes 
 //		if (!baseType.equals(inheritance.baseClass))
 //			System.out.println();
 		//super.handleComplexType(topLevelComplexType);
@@ -484,13 +465,13 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		Element element = elementObj.getElement();
 		String name = getName(elementObj);//element.getName();
 		
-		if ("Text".equals(name))
+		if (name.contains("Canvas"))
 			System.out.println();
 		
 		String type = "XML.Element";
 		Set<String> types = new LinkedHashSet<String>();
 		if (element.getType() != null) {
-			types.add(getType(element.getType()));
+			types.add(getType(element.getType(), ""));
 		}
 		QName base = this.base.getElementBase(element);
 		if (base != null) {
@@ -500,16 +481,16 @@ public class OntologyGenerator implements SchemaConversionComponent {
 					throw new RuntimeException("Cannot get L0 type for " + base.getLocalPart());
 				types.add(l0Type);
 			} else if (this.base.isElementRef(base.getLocalPart()))
-				types.add(ontRoot+base.getLocalPart());
+				types.add(ontRoot+this.base.getName(base));
 			else
-				types.add(ontRoot+getComplexTypePrefix()+base.getLocalPart());
+				types.add(ontRoot+getComplexTypePrefix()+this.base.getName(base));
 		}
 		QName substitution = element.getSubstitutionGroup();
 		if (substitution != null) {
 			if (this.base.isElementRef(substitution.getLocalPart()))
-				types.add(ontRoot+substitution.getLocalPart());
+				types.add(ontRoot+this.base.getName(substitution));
 			else
-				types.add( ontRoot+getComplexTypePrefix()+substitution.getLocalPart());
+				types.add( ontRoot+getComplexTypePrefix()+this.base.getName(substitution));
 		}
 		for (String t : types) {
 			type += " <T " + t;
@@ -521,7 +502,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
 //			relationName = ontRoot+getName(elementObj.getParent()) + "has"+element.getName();
 //		}
 		writer.println(relationName+ " <R XML.hasElement");
-		writer.println(relationName+ "List <R XML.hasElementList");
+		writer.println(relationName+ "_List <R XML.hasElementList");
 		
 		writer.println(name+ " <T "+type);
 		
@@ -555,18 +536,23 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		throw new RuntimeException("ObjectType " + type + " has no base class");
 	}
 	
+	
 	@Override
 	public String getName(SchemaObject obj) {
 		if (obj.getParent() == null) {
 			switch (obj.getType()) {
 			case COMPLEX_TYPE:
-				return ontRoot+getComplexTypePrefix()+obj.getName();
+				//return ontRoot+getComplexTypePrefix()+obj.getName();
+				return obj.getLibShortName()+"."+getComplexTypePrefix()+obj.getName();
 			case ELEMENT:
-				return ontRoot+obj.getName();
+				//return ontRoot+obj.getName();
+				return obj.getLibShortName()+"."+obj.getName();
 			case ATTRIBUTE_GROUP:
-				return ontRoot+getAttributeGroupPrefix()+obj.getName();
+				//return ontRoot+getAttributeGroupPrefix()+obj.getName();
+				return obj.getLibShortName()+"."+getAttributeGroupPrefix()+obj.getName();
 			case SIMPLE_TYPE:
-				return ontRoot+obj.getName();
+				//return ontRoot+getSimpleTypePrefix()+obj.getName();
+				return obj.getLibShortName()+"."+getSimpleTypePrefix()+obj.getName();
 			}
 		} else {
 			SchemaObject o = obj;
@@ -581,30 +567,46 @@ public class OntologyGenerator implements SchemaConversionComponent {
 			name = name.substring(0, name.length()-1);
 			switch (prev.getType()) {
 			case COMPLEX_TYPE:
-				return ontRoot+getComplexTypePrefix()+name;
+				//return ontRoot+getComplexTypePrefix()+name;
+				return obj.getLibShortName()+"."+getComplexTypePrefix()+name;
 			case ELEMENT:
-				return ontRoot+name;
+				//return ontRoot+name;
+				return obj.getLibShortName()+"."+name;
 			case ATTRIBUTE_GROUP:
-				return ontRoot+getAttributeGroupPrefix()+name;
+				//return ontRoot+getAttributeGroupPrefix()+name;
+				return obj.getLibShortName()+"."+getAttributeGroupPrefix()+name;
 			case SIMPLE_TYPE:
-				return ontRoot+name;
+				//return ontRoot+getSimpleTypePrefix()+name;
+				return obj.getLibShortName()+"."+getSimpleTypePrefix()+name;
 			}
 		}
 		throw new RuntimeException();
 		
 	}
 	
+	public String getName(SchemaObject parent, SchemaElement e, String rel) {
+		QName ref = e.getElement().getRef();
+		if (ref != null) {
+			return converter.getShortName(ref.getNamespaceURI()) + rel + base.getName(ref);
+		}
+		else {
+			return getName(parent, "") + "." + rel + e.getElement().getName();
+		}
+	}
+	
 	public String getName(SchemaObject obj, String rel) {
 		if (obj.getParent() == null) {
 			switch (obj.getType()) {
 			case COMPLEX_TYPE:
-				return ontRoot+getComplexTypePrefix()+rel+obj.getName();
+				return obj.getLibShortName()+"."+getComplexTypePrefix()+rel+obj.getName();
 			case ELEMENT:
-				return ontRoot+rel+obj.getName();
+				return obj.getLibShortName()+"."+rel+obj.getName();
 			case ATTRIBUTE_GROUP:
-				return ontRoot+getAttributeGroupPrefix()+rel+obj.getName();
+				return obj.getLibShortName()+"."+getAttributeGroupPrefix()+rel+obj.getName();
 			case SIMPLE_TYPE:
-				return ontRoot+rel+obj.getName();
+				return obj.getLibShortName()+"."+getSimpleTypePrefix()+rel+obj.getName();
+			case ATTRIBUTE:
+				return obj.getLibShortName()+"."+rel+obj.getName();
 			}
 		} else {
 			SchemaObject o = obj;
@@ -619,13 +621,15 @@ public class OntologyGenerator implements SchemaConversionComponent {
 			name = name.substring(0, name.length()-1);
 			switch (prev.getType()) {
 			case COMPLEX_TYPE:
-				return ontRoot+getComplexTypePrefix()+rel+name;
+				return obj.getLibShortName()+"."+getComplexTypePrefix()+rel+name;
 			case ELEMENT:
-				return ontRoot+rel+name;
+				return obj.getLibShortName()+"."+rel+name;
 			case ATTRIBUTE_GROUP:
-				return ontRoot+getAttributeGroupPrefix()+rel+name;
+				return obj.getLibShortName()+"."+getAttributeGroupPrefix()+rel+name;
 			case SIMPLE_TYPE:
-				return ontRoot+rel+name;
+				return obj.getLibShortName()+"."+getSimpleTypePrefix()+rel+name;
+			case ATTRIBUTE:
+				return obj.getLibShortName()+"."+rel+obj.getName();
 			}
 		}
 		throw new RuntimeException();