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=095de9d2c20049a9f543fdae21459ebc8ef1dc91;hb=057ca542a11f7d0eb83860e3e65fd6eff79813ea;hp=530798ed2844bab05acb6784e4085dd69d04544b;hpb=ada38ab0a1a98dcb413bef3273064da36ce2d273;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 530798e..095de9d 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
@@ -101,6 +101,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 			version = "1.0";
 		
 		name = name.replaceAll("\\.", "_");
+		name = name.replaceAll(" ", "_");
 		className = converter.getPluginName() + "." + name;
 		
 		for (String s : converter.getHeader()) {
@@ -108,6 +109,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 		}
 		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("   @L0.new");
@@ -117,24 +119,24 @@ public class OntologyGenerator extends SchemaConversionBase {
 		
 		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(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();
@@ -220,7 +222,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 					writer.print(" <R " + type);
 				}
 			} else {
-				writer.print(" <R " +  ontRoot+"XML.hasElement");
+				writer.print(" <R XML.hasElement");
 			}
 			
 			writer.println();
@@ -241,9 +243,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) {
@@ -269,18 +271,18 @@ public class OntologyGenerator extends SchemaConversionBase {
 			writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+ getName(obj,"has"));
 			writer.println("   --> " + ontRoot+getName(obj));
 		} else {
-			writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+"XML.hasElement");
+			writer.println(ontRoot+getName(parent)+".has"+refName + " <R XML.hasElement");
 			writer.println("   --> " + getType(refType));
 		}
 		
 		if (useElementList(parent, indicator,element, reference, refName, refType)) {
 			
 			if (type == null) {
-				writer.println(ontRoot+getName(parent)+"."+refName + "List <T "  + ontRoot+"XML.ElementList");
+				writer.println(ontRoot+getName(parent)+"."+refName + "List <T 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(ontRoot+getName(parent)+"."+refName + "List <T XML.ElementList");
+				writer.println(ontRoot+getName(parent)+".has"+refName + "List <R XML.hasElementList : L0.FunctionalRelation");	
 			}
 		}
 	}
@@ -289,7 +291,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 		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)+"."+refName + "List <T XML.ElementList");
 			writer.println(ontRoot+getName(parent)+".has"+refName + "List <R " +  ontRoot+getName(obj,"has")+"List : L0.FunctionalRelation");
 		}
 	}
@@ -312,7 +314,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 			relationName = ontRoot+"has"+name;
 			if (parent != null)
 				relationName = ontRoot+getName(parent)+".has"+name;
-			relationType = ontRoot+"XML.hasAttribute";
+			relationType = "XML.hasAttribute";
 		}
 		else if (ref != null && parent != null) {
 			relationName = ontRoot+getName(parent)+".has"+ref.getLocalPart();
@@ -327,7 +329,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 			if (ontType != null) {
 				id = getTypeEntry(primitiveType).id;
 				if (id)
-					relationType = ontRoot+"XML.hasID";
+					relationType = "XML.hasID";
 			} else {
 				
 			}
@@ -372,7 +374,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) {
@@ -401,19 +403,32 @@ 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 = ontRoot+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 = ontRoot+getName(parent)+".has"+name;
+			
+			writer.println(relationName+ " <R XML.hasAttribute : L0.FunctionalRelation");
+			
+			String ontType = getL0Type(base);
+			writer.println("   --> " + ontType);
+		}
 	}
 	
 	@Override
@@ -426,12 +441,12 @@ public class OntologyGenerator extends SchemaConversionBase {
 		
 		String relationName = ontRoot+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();
-		String baseType = ontRoot+"XML.ComplexType";
+		String baseType = "XML.ComplexType";
 
 		QName base = getComplexTypeBase(topLevelComplexType.getComplexType());
 		if (base != null) {
@@ -451,11 +466,14 @@ public class OntologyGenerator extends SchemaConversionBase {
 	protected void handleElement(SchemaObject elementObj) {
 		Element element = elementObj.getElement();
 		String name = getName(elementObj);//element.getName();
+		
+//		if ("Presentation".equals(name))
+//			System.out.println();
 
 //		if (parent != null)
 //			name = parent +"_"+name;
 		
-		String type = ontRoot+"XML.Element";
+		String type = "XML.Element";
 		Set<String> types = new LinkedHashSet<String>();
 		if (element.getType() != null) {
 			types.add(getType(element.getType()));
@@ -488,8 +506,8 @@ public class OntologyGenerator extends SchemaConversionBase {
 //			//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);
 		
@@ -508,7 +526,7 @@ 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(ontRoot+name+"."+ref.getReference().getName()+ " <R XML.hasReference");
 		}
 		
 		writer.println();