X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FOntologyGenerator.java;fp=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FOntologyGenerator.java;h=e64a59bf3f296fb0fae84e84e3341502b406d522;hb=404be73748777cdd2d09b2f29308ae6f4a3d730c;hp=8e5c3c1fdeb7dfb85a684f855927c4d568410768;hpb=28cdb08c2dcc6b306d8a0cbea8c0bd791e42d583;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 8e5c3c1..e64a59b 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
@@ -21,7 +21,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,7 +36,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 	String commentTag = "//";
 	
 	Schema schema;
-	String ontologyName;
+	String ontologyUri;
 	String className;
 	
 	SchemaConverter converter;
@@ -51,7 +50,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 	public void createOntology(Schema schema, String ontologyName, String className, SchemaConverter converter) throws FileNotFoundException {
 		this.schema = schema;
 		this.converter = converter;
-		this.ontologyName = ontologyName;
+		this.ontologyUri = ontologyName;
 		this.className = className;
 		
 //		for (OpenAttrs attrs : schema.getIncludeOrImportOrRedefine()) {
@@ -85,14 +84,10 @@ public class OntologyGenerator extends SchemaConversionBase {
 	}
 	
 	protected void handle(Schema schema) {
-		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";
 
-		
 		for (String s : converter.getHeader()) {
 			writer.println(commentTag + " " + s);	
 		}
@@ -100,32 +95,13 @@ public class OntologyGenerator extends SchemaConversionBase {
 		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();
@@ -141,6 +117,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) {
@@ -251,7 +229,6 @@ public class OntologyGenerator extends SchemaConversionBase {
 	
 	
 	@Override
-	//protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, boolean reference, String refName, QName refType) {
 	protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType refType) {
 		if (refType != refType.Element) {
 			QName referenceType = null;
@@ -442,10 +419,8 @@ public class OntologyGenerator extends SchemaConversionBase {
 	@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;