X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FOntologyGenerator.java;h=741e197f0e2ff50bf9bb6b41c619fe94fd78471e;hb=fb01c21839aea801224aeb82b64bd261120619d5;hp=0b7aa3c00aefa89263005c0a2fd87bf2fd3f849a;hpb=bcfe73ff5f614ff83f20ce7bf5bfc0fa1b045978;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 0b7aa3c..741e197 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
@@ -11,6 +11,7 @@ import java.util.Set;
 import javax.xml.namespace.QName;
 
 import org.simantics.utils.datastructures.BijectionMap;
+import org.simantics.xml.sax.SchemaObject.ObjectType;
 import org.simantics.xml.sax.configuration.AttributeComposition;
 import org.simantics.xml.sax.configuration.Configuration;
 import org.simantics.xml.sax.configuration.IDReference;
@@ -21,7 +22,6 @@ import org.w3._2001.xmlschema.Element;
 import org.w3._2001.xmlschema.LocalComplexType;
 import org.w3._2001.xmlschema.LocalSimpleType;
 import org.w3._2001.xmlschema.NamedAttributeGroup;
-import org.w3._2001.xmlschema.OpenAttrs;
 import org.w3._2001.xmlschema.Restriction;
 import org.w3._2001.xmlschema.Schema;
 import org.w3._2001.xmlschema.SimpleType;
@@ -37,20 +37,22 @@ public class OntologyGenerator extends SchemaConversionBase {
 	String commentTag = "//";
 	
 	Schema schema;
-	
+	String ontologyUri;
 	String className;
 	
 	SchemaConverter converter;
 	
 	PrintWriter writer = null;
 	
-	public String getClassName() {
-		return className;
-	}
 	
-	public void createOntology(Schema schema, SchemaConverter converter) throws FileNotFoundException {
+	
+	
+	
+	public void createOntology(Schema schema, String ontologyName, String className, SchemaConverter converter) throws FileNotFoundException {
 		this.schema = schema;
 		this.converter = converter;
+		this.ontologyUri = ontologyName;
+		this.className = className;
 		
 //		for (OpenAttrs attrs : schema.getIncludeOrImportOrRedefine()) {
 //			if (attrs instanceof Annotation) {
@@ -83,59 +85,24 @@ public class OntologyGenerator extends SchemaConversionBase {
 	}
 	
 	protected void handle(Schema schema) {
-		String ontologyName = schema.getTargetNamespace();
-		if (ontologyName == null) {
-			ontologyName = converter.getSchemaFile().getName();
-			
-			int index = ontologyName.lastIndexOf(".");
-			if (index > 0)
-				ontologyName = ontologyName.substring(0, index);
-		} 
-		if (!ontologyName.startsWith("http"))
-			ontologyName = "http://" + ontologyName;
-		String parts[] = ontologyName.split("/");
+		String parts[] = ontologyUri.split("/");
 		String name = parts[parts.length-1];
 		ontRoot = name.substring(0, Math.min(3, name.length())).toUpperCase();
-		String version = schema.getVersion();
-		if (version == null)
-			version = "1.0";
-		
-		name = name.replaceAll("\\.", "_");
-		name = name.replaceAll(" ", "_");
-		className = converter.getPluginName() + "." + name;
-		
+
 		for (String s : converter.getHeader()) {
 			writer.println(commentTag + " " + s);	
 		}
 		writer.println();
 		writer.println("L0 = <http://www.simantics.org/Layer0-1.1>");
+		writer.println("XML = <http://www.simantics.org/XML-1.0>");
 		writer.println();
-		writer.println(ontRoot + " = <" + ontologyName +"-"+ version+"> : L0.Ontology");
+		writer.println(ontRoot + " = <" + ontologyUri +"> : L0.Ontology");
 		writer.println("   @L0.new");
 		writer.println("   L0.HasResourceClass \"" + className +"\"");
 		writer.println();
 		writer.println();
 		
 		ontRoot += ".";
-		// TODO : these could be created in separate base ontology.
-		writer.println(commentTag + " Built-in types");
-		writer.println();
-		writer.println(ontRoot+"XML : L0.Library");
-		writer.println(ontRoot+"XML.hasAttribute <R L0.HasProperty");
-		writer.println(ontRoot+"XML.hasID <R "+ontRoot+"XML.hasAttribute : L0.FunctionalRelation");
-		writer.println("  --> L0.String");
-		writer.println(ontRoot+"XML.ComplexType <T L0.Entity");
-		writer.println(ontRoot+"XML.hasComplexType <R L0.IsComposedOf");
-		writer.println(ontRoot+"XML.AttributeGroup  <T L0.Entity");
-		writer.println(ontRoot+"XML.Element <T L0.Entity");
-		writer.println(ontRoot+"XML.hasElement <R L0.IsComposedOf");
-		writer.println(ontRoot+"XML.ElementList <T L0.List");
-		writer.println(ontRoot+"XML.hasElementList <R L0.IsComposedOf");
-		writer.println(ontRoot+"XML.hasOriginalElementList <R " + ontRoot+"XML.hasElementList");
-		writer.println(ontRoot+"XML.hasReference <R L0.IsRelatedTo");
-		writer.println(ontRoot+"XML.hasExternalReference <R L0.IsRelatedTo");
-		writer.println("   L0.InverseOf " + ontRoot+"XML.externalReferenceOf <R L0.IsRelatedTo");
-		writer.println();
 		writer.println(ontRoot+"ComplexTypes : L0.Library");
 		writer.println(ontRoot+"AttributeGroups : L0.Library");
 		writer.println();
@@ -151,6 +118,8 @@ public class OntologyGenerator extends SchemaConversionBase {
 			return ontType;
 		else if (isComplexTypeRef(qtype.getLocalPart()))
 			return ontRoot+getComplexTypePrefix()+qtype.getLocalPart();
+		else if (isSimpleTypeRef(qtype.getLocalPart()))
+			return ontRoot+qtype.getLocalPart();
 		else if (isElementRef(qtype.getLocalPart()))
 			return ontRoot+qtype.getLocalPart();
 		else if (qtype.getPrefix() != null && qtype.getPrefix().length() > 0) {
@@ -172,11 +141,11 @@ public class OntologyGenerator extends SchemaConversionBase {
 	}
 	
 	
-	public static String getComplexTypePrefix() {
+	public String getComplexTypePrefix() {
 		return "ComplexTypes.";
 	}
 	
-	public static String getAttributeGroupPrefix() {
+	public String getAttributeGroupPrefix() {
 		return "AttributeGroups.";
 	}
 	
@@ -195,7 +164,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 					break;
 				}
 			}
-			String relationName = ontRoot+getName(parent)+".has"+name;
+			String relationName = getName(parent)+".has"+name;
 			writer.print(relationName);
 			
 			List<String> types = new ArrayList<String>();
@@ -213,7 +182,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 				}
 				if (type == null) {
 					SchemaObject obj = getWithName(parent, refType.getLocalPart());
-					types.add(ontRoot+getName(obj,"has"));
+					types.add(getName(obj,"has"));
 				} 
 			}
 			if (types.size() > 0) {
@@ -221,7 +190,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 					writer.print(" <R " + type);
 				}
 			} else {
-				writer.print(" <R " +  ontRoot+"XML.hasElement");
+				writer.print(" <R XML.hasElement");
 			}
 			
 			writer.println();
@@ -242,9 +211,9 @@ public class OntologyGenerator extends SchemaConversionBase {
 				}
 			}
 			if (!single) {
-				writer.println(ontRoot+name+ "List <T "+ontRoot+"XML.ElementList");
+				writer.println(ontRoot+name+ "List <T XML.ElementList");
 				if (types.size() == 0) {
-				writer.println(relationName+ "List <R "+ontRoot+"XML.hasElementList : L0.FunctionalRelation");
+				writer.println(relationName+ "List <R XML.hasElementList : L0.FunctionalRelation");
 				} else {
 					writer.print(relationName+ "List");
 					for (String type : types) {
@@ -261,38 +230,56 @@ public class OntologyGenerator extends SchemaConversionBase {
 	
 	
 	@Override
-	protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, boolean reference, String refName, QName refType) {
-		String type = getL0TypeFromPrimitiveType(refType);
-		SchemaObject obj = null;
-		if (type == null) {
-			obj = getWithName(parent, refType.getLocalPart());
+	protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType refType) {
+		if (refType != refType.Element) {
+			QName referenceType = null;
+			if (refType == RefType.Type) {
+				referenceType = element.getElement().getType();
+				//refName = element.getElement().getName()
+				SchemaObject eObj = elements.get(element.getElement());
+				if (refName == null)
+					refName = eObj.getName();
+			} else {
+				referenceType = element.getElement().getRef();
+				if (refName == null)
+					refName = referenceType.getLocalPart();
+			}
+			String type = getL0TypeFromPrimitiveType(referenceType);
+			SchemaObject obj = null;
+			if (type == null) {
+				obj = getWithName(parent, referenceType.getLocalPart());
+				
+				writer.println(getName(parent)+".has"+refName + " <R " +  getName(obj,"has"));
+				writer.println("   --> " + getName(obj));
+			} else {
+				writer.println(getName(parent)+".has"+refName + " <R XML.hasElement");
+				writer.println("   --> " + getType(referenceType));
+			}
 			
-			writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+ getName(obj,"has"));
-			writer.println("   --> " + ontRoot+getName(obj));
+			if (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");
+				} else {
+					writer.println(getName(parent)+"."+refName + "List <T XML.ElementList");
+					writer.println(getName(parent)+".has"+refName + "List <R XML.hasElementList : L0.FunctionalRelation");	
+				}
+			}
 		} else {
-			writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+"XML.hasElement");
-			writer.println("   --> " + getType(refType));
-		}
-		
-		if (useElementList(parent, indicator,element, reference, refName, refType)) {
+			Element attrs = element.getElement();
+			SchemaObject obj = getWithObj(parent, attrs);
+			if (refName == null)
+				refName = obj.getName();
 			
-			if (type == null) {
-				writer.println(ontRoot+getName(parent)+"."+refName + "List <T "  + ontRoot+"XML.ElementList");
-				writer.println(ontRoot+getName(parent)+".has"+refName + "List <R " +  ontRoot+getName(obj,"has")+"List : L0.FunctionalRelation");
-			} else {
-				writer.println(ontRoot+getName(parent)+"."+refName + "List <T "  + ontRoot+"XML.ElementList");
-				writer.println(ontRoot+getName(parent)+".has"+refName + "List <R " +  ontRoot+"XML.hasElementList : L0.FunctionalRelation");	
+			writer.println(getName(parent)+".has"+refName + " <R " + getName(obj,"has"));
+			writer.println("   --> " + getName(obj));
+			if (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");
 			}
 		}
-	}
-	protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, boolean reference, String refName, OpenAttrs attrs) {
-		SchemaObject obj = getWithObj(parent, attrs);
-		writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+ getName(obj,"has"));
-		writer.println("   --> " + ontRoot+getName(obj));
-		if (useElementList(parent, indicator,element, reference, refName, new QName(obj.getName()))) {
-			writer.println(ontRoot+getName(parent)+"."+refName + "List <T "  + ontRoot+"XML.ElementList");
-			writer.println(ontRoot+getName(parent)+".has"+refName + "List <R " +  ontRoot+getName(obj,"has")+"List : L0.FunctionalRelation");
-		}
+		
 	}
 	
 	@Override
@@ -312,11 +299,11 @@ public class OntologyGenerator extends SchemaConversionBase {
 		if (name != null) {
 			relationName = ontRoot+"has"+name;
 			if (parent != null)
-				relationName = ontRoot+getName(parent)+".has"+name;
-			relationType = ontRoot+"XML.hasAttribute";
+				relationName = getName(parent)+".has"+name;
+			relationType = "XML.hasAttribute";
 		}
 		else if (ref != null && parent != null) {
-			relationName = ontRoot+getName(parent)+".has"+ref.getLocalPart();
+			relationName = getName(parent)+".has"+ref.getLocalPart();
 			relationType = ontRoot+"has"+ref.getLocalPart();
 		} else {
 			throw new RuntimeException();
@@ -328,7 +315,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 			if (ontType != null) {
 				id = getTypeEntry(primitiveType).id;
 				if (id)
-					relationType = ontRoot+"XML.hasID";
+					relationType = "XML.hasID";
 			} else {
 				
 			}
@@ -373,7 +360,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 	protected void handle(SchemaObject parent, AttributeGroup attributeGroup) {
 		if (parent == null) {
 			NamedAttributeGroup group = (NamedAttributeGroup)attributeGroup;
-			writer.println(ontRoot+getAttributeGroupPrefix()+group.getName()+ " <T " + ontRoot +"XML.AttributeGroup");
+			writer.println(ontRoot+getAttributeGroupPrefix()+group.getName()+ " <T XML.AttributeGroup");
 			SchemaObject obj = new SchemaObject(parent,attributeGroup);
 			for (Annotated annotated : group.getAttributeOrAttributeGroup()) {
 				if (annotated instanceof Attribute) {
@@ -384,7 +371,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 				}
 			}
 		} else {
-			writer.println(ontRoot+getName(parent) +" L0.Inherits " + ontRoot + getAttributeGroupPrefix() + attributeGroup.getRef().getLocalPart());
+			writer.println(getName(parent) +" L0.Inherits " + ontRoot + getAttributeGroupPrefix() + attributeGroup.getRef().getLocalPart());
 		}
 		
 	}
@@ -402,48 +389,68 @@ public class OntologyGenerator extends SchemaConversionBase {
 	protected void handleSimpleType(SchemaObject parent, SchemaObject simpleTypeObj) {
 		SimpleType simpleType = simpleTypeObj.getSimpleType();
 		String name = simpleType.getName();
-		Restriction restriction = simpleType.getRestriction();
-		if (restriction == null || simpleType.getUnion() != null || simpleType.getId() != null)
-			throw new RuntimeException();
-		QName base = restriction.getBase();
-		
-		String relationName = ontRoot+"has"+name;
-		if (parent != null)
-			relationName = ontRoot+getName(parent)+".has"+name;
 		
-		writer.println(relationName+ " <R "+ontRoot+"XML.hasAttribute : L0.FunctionalRelation");
-		
-		String ontType = getL0Type(base);
-		writer.println("   --> " + ontType);
+		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;
+			writer.println(relationName+ " <R XML.hasAttribute : L0.FunctionalRelation");
+			
+			String ontType = getL0Type(new QName(SCHEMA_NS, "string"));
+			writer.println("   --> " + ontType);
+		} else {
+			Restriction restriction = simpleType.getRestriction();
+			if (restriction == null || simpleType.getUnion() != null || simpleType.getId() != null)
+				throw new RuntimeException(simpleType.getName() + " restriction error");
+			QName base = restriction.getBase();
+			
+			String relationName = ontRoot+"has"+name;
+			if (parent != null)
+				relationName = getName(parent)+".has"+name;
+			
+			writer.println(relationName+ " <R XML.hasAttribute : L0.FunctionalRelation");
+			
+			String ontType = getL0Type(base);
+			writer.println("   --> " + ontType);
+		}
 	}
 	
 	@Override
 	protected void handleComplexType(SchemaObject topLevelComplexType) {
 		String name = getName(topLevelComplexType);
-		if (name.contains("Pcurve"))
-			System.out.println();
-//		if (parent != null)
-//			name = parent +"_"+name;
+//		if (topLevelComplexType.getName().equals("Reference"))
+//			System.out.println();
 		
-		String relationName = ontRoot+getName(topLevelComplexType,"has");//ontRoot+"has"+name;
+		String relationName = getName(topLevelComplexType,"has");//ontRoot+"has"+name;
 		
-		writer.println(relationName+ " <R "+ontRoot+"XML.hasComplexType");
-		writer.println(relationName+ "List <R "+ontRoot+"XML.hasElementList");
+		writer.println(relationName+ " <R XML.hasComplexType");
+		writer.println(relationName+ "List <R XML.hasElementList");
 		//writer.println("   --> " + ontRoot+getComplexTypePrefix()+name);
-		writer.println("   --> " + ontRoot+name);
+		writer.println("   --> " + name);
 		writer.println();
-		String baseType = ontRoot+"XML.ComplexType";
-
-		QName base = getComplexTypeBase(topLevelComplexType.getComplexType());
-		if (base != null) {
-			baseType = getType(base);
-		}
-		base = getSimpleTypeBase(topLevelComplexType.getSimpleType());
-		if (base != null) {
-			baseType = getType(base);
+//		String baseType = "XML.ComplexType";
+//
+//		QName base = getComplexTypeBase(topLevelComplexType.getComplexType());
+//		if (base != null) {
+//			baseType = getType(base);
+//		}
+//		base = getSimpleTypeBase(topLevelComplexType.getSimpleType());
+//		if (base != null) {
+//			baseType = getType(base);
+//		}
+		Inheritance inheritance = getInheritance(topLevelComplexType);
+		
+//		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);
 		}
-		//writer.println(ontRoot+getComplexTypePrefix()+name+ " <T "+baseType);
-		writer.println(ontRoot+name+ " <T "+baseType);
+//		if (!baseType.equals(inheritance.baseClass))
+//			System.out.println();
 		super.handleComplexType(topLevelComplexType);
 		writer.println();
 	}
@@ -453,13 +460,10 @@ public class OntologyGenerator extends SchemaConversionBase {
 		Element element = elementObj.getElement();
 		String name = getName(elementObj);//element.getName();
 		
-//		if ("Presentation".equals(name))
-//			System.out.println();
-
-//		if (parent != null)
-//			name = parent +"_"+name;
+		if ("Text".equals(name))
+			System.out.println();
 		
-		String type = ontRoot+"XML.Element";
+		String type = "XML.Element";
 		Set<String> types = new LinkedHashSet<String>();
 		if (element.getType() != null) {
 			types.add(getType(element.getType()));
@@ -487,15 +491,15 @@ public class OntologyGenerator extends SchemaConversionBase {
 			type += " <T " + t;
 		}
 
-		String relationName =  ontRoot+getName(elementObj,"has");//ontRoot+"has"+name;
+		String relationName =  getName(elementObj,"has");//ontRoot+"has"+name;
 //		if (elementObj.getParent() != null) {
 //			//relationName = ontRoot+getComplexTypePrefix()+"has"+name.substring(getComplexTypePrefix().length());
 //			relationName = ontRoot+getName(elementObj.getParent()) + "has"+element.getName();
 //		}
-		writer.println(relationName+ " <R "+ontRoot+"XML.hasElement");
-		writer.println(relationName+ "List <R "+ontRoot+"XML.hasElementList");
+		writer.println(relationName+ " <R XML.hasElement");
+		writer.println(relationName+ "List <R XML.hasElementList");
 		
-		writer.println(ontRoot+name+ " <T "+type);
+		writer.println(name+ " <T "+type);
 		
 		LocalComplexType complexType = element.getComplexType();
 		LocalSimpleType simpleType = element.getSimpleType();
@@ -512,23 +516,32 @@ public class OntologyGenerator extends SchemaConversionBase {
 		List<IDReference> references = getIDReferences(element);
 	
 		for (IDReference ref : references) {
-			writer.println(ontRoot+name+"."+ref.getReference().getName()+ " <R " +ontRoot+"XML.hasReference");
+			writer.println(name+"."+ref.getReference().getName()+ " <R XML.hasReference");
 		}
 		
 		writer.println();
 	}
 	
-	public static String getName(SchemaObject obj) {
+	@Override
+	protected String getBaseClass(ObjectType type) {
+		if (type == ObjectType.ELEMENT)
+			return "XML.Element";
+		if (type == ObjectType.COMPLEX_TYPE)
+			return "XML.ComplexType";
+		throw new RuntimeException("ObjectType " + type + " has no base class");
+	}
+	
+	public String getName(SchemaObject obj) {
 		if (obj.getParent() == null) {
 			switch (obj.getType()) {
 			case COMPLEX_TYPE:
-				return getComplexTypePrefix()+obj.getName();
+				return ontRoot+getComplexTypePrefix()+obj.getName();
 			case ELEMENT:
-				return obj.getName();
+				return ontRoot+obj.getName();
 			case ATTRIBUTE_GROUP:
-				return getAttributeGroupPrefix()+obj.getName();
+				return ontRoot+getAttributeGroupPrefix()+obj.getName();
 			case SIMPLE_TYPE:
-				return obj.getName();
+				return ontRoot+obj.getName();
 			}
 		} else {
 			SchemaObject o = obj;
@@ -543,30 +556,30 @@ public class OntologyGenerator extends SchemaConversionBase {
 			name = name.substring(0, name.length()-1);
 			switch (prev.getType()) {
 			case COMPLEX_TYPE:
-				return getComplexTypePrefix()+name;
+				return ontRoot+getComplexTypePrefix()+name;
 			case ELEMENT:
-				return name;
+				return ontRoot+name;
 			case ATTRIBUTE_GROUP:
-				return getAttributeGroupPrefix()+name;
+				return ontRoot+getAttributeGroupPrefix()+name;
 			case SIMPLE_TYPE:
-				return name;
+				return ontRoot+name;
 			}
 		}
 		throw new RuntimeException();
 		
 	}
 	
-	public static String getName(SchemaObject obj, String rel) {
+	public String getName(SchemaObject obj, String rel) {
 		if (obj.getParent() == null) {
 			switch (obj.getType()) {
 			case COMPLEX_TYPE:
-				return getComplexTypePrefix()+rel+obj.getName();
+				return ontRoot+getComplexTypePrefix()+rel+obj.getName();
 			case ELEMENT:
-				return rel+obj.getName();
+				return ontRoot+rel+obj.getName();
 			case ATTRIBUTE_GROUP:
-				return getAttributeGroupPrefix()+rel+obj.getName();
+				return ontRoot+getAttributeGroupPrefix()+rel+obj.getName();
 			case SIMPLE_TYPE:
-				return rel+obj.getName();
+				return ontRoot+rel+obj.getName();
 			}
 		} else {
 			SchemaObject o = obj;
@@ -581,13 +594,13 @@ public class OntologyGenerator extends SchemaConversionBase {
 			name = name.substring(0, name.length()-1);
 			switch (prev.getType()) {
 			case COMPLEX_TYPE:
-				return getComplexTypePrefix()+rel+name;
+				return ontRoot+getComplexTypePrefix()+rel+name;
 			case ELEMENT:
-				return rel+name;
+				return ontRoot+rel+name;
 			case ATTRIBUTE_GROUP:
-				return getAttributeGroupPrefix()+rel+name;
+				return ontRoot+getAttributeGroupPrefix()+rel+name;
 			case SIMPLE_TYPE:
-				return rel+name;
+				return ontRoot+rel+name;
 			}
 		}
 		throw new RuntimeException();