X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.graph.db%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Fdb%2FStreamingTransferableGraphImportProcess.java;h=e61937fc9e90aaf92d2dc57767d35c4545d6b91e;hp=9a819635463a8703651465c312bc688b3622326f;hb=55feb8ea3a74bf5ce73619d62d4c73e576ae89fc;hpb=ec2bfe436698e74bdcb0b7708b246fe1971d557b

diff --git a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
index 9a8196354..e61937fc9 100644
--- a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
+++ b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
@@ -188,6 +188,21 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 		this.handles = new int[resourceCount];
 		TIntObjectMap<Identity> identityMap = TransferableGraphUtils.mapIdentities(identities);
 		
+		// We must process roots first, because internal identifiers depend on them.
+		for(Identity identity : identities) {
+			IdentityDefinition definition = identity.definition;
+			if (definition instanceof Root) {
+				Root root = (Root) definition;
+				if (root.name.equals(""))
+					handles[identity.resource] = builder.handle(RootLibrary);
+				else {
+					Resource existing = advisor.analyzeRoot(graph, root);
+					if (existing != null)
+						handles[identity.resource] = builder.handle(existing);
+				}
+			}
+		}
+		
 		for(Identity identity : identities) {
 			IdentityDefinition definition = identity.definition;
 			if(definition instanceof External) {
@@ -227,16 +242,6 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 					existingInternalMap.put(identity.resource, existing);
 				}
 			}
-			else if(definition instanceof Root) {
-				Root root = (Root)definition;
-				if(root.name.equals(""))
-				    handles[identity.resource] = builder.handle(RootLibrary);
-				else  {
-					Resource existing = advisor.analyzeRoot(graph, root);
-					if(existing != null)
-					    handles[identity.resource] = builder.handle(existing);
-				}
-			}
 			else if(definition instanceof Optional) {
 				External def = (External)definition;
 				Resource parent = builder.resource(handles[def.parent]);
@@ -244,22 +249,33 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 					handles[identity.resource] = builder.handle(graph.syncRequest(new UnescapedChildMapOfResource(parent)).get(def.name));				
 			}
 		}		
-		
-		//if(!missingExternals.isEmpty()) throw new MissingDependencyException(this);
-		
+
+		if (!missingExternals.isEmpty() && failOnMissingEntities())
+			throw new MissingDependencyException(this);
+	}
+
+	private boolean failOnMissingEntities() {
+		return "true".equalsIgnoreCase(
+				System.getProperty(
+						"org.simantics.tg.import.failOnMissingEntities",
+						"false") );
 	}
 
 	@Override
 	public Resource createChild(WriteOnlyGraph graph, Resource parent, Resource child, String name) throws DatabaseException {
+		//System.err.println("child " + parent + " - " + child + " = " + name);
 	    if(child == null) child = graph.newResource();
 		Resource nameResource = graph.newResource();
 		graph.claim(nameResource, InstanceOf, null, String);
 		graph.claimValue(nameResource, name, WriteBindings.STRING);
 		graph.claim(child, HasName, NameOf, nameResource);
+		graph.claim(parent,  ConsistsOf, PartOf, child);
 		return child;
 	}
 
 	int[] getClustering() {
+		if (vg != null)
+			return null;
 		Variant v = extensions.get(Extensions.CLUSTERING);
 		if(v == null) return null;
 		try {
@@ -271,6 +287,8 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 	}
 
 	int[] getClusterSets() {
+		if (vg != null)
+			return null;
 		Variant v = extensions.get(Extensions.CLUSTER_SETS);
 		if(v == null) return null;
 		try {
@@ -347,7 +365,7 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 				Resource parent = resolvedParents.get(parts[0]);
 				// TODO: proper exception message
 				if(parent == null) {
-					throw new IllegalStateException("!!");
+					throw new IllegalStateException("Missing URI: " + uri);
 				}
 
 				Resource childResource = graph.newResource();
@@ -457,7 +475,6 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 			}
 			else if(definition instanceof Internal) {
 				Internal def = (Internal)definition;
-				
 				Resource external = existingInternalMap.get(identity.resource);
 				if(external != null) {
 					handles[identity.resource] = builder.handle(external);
@@ -597,7 +614,11 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 		tg.forValues2(null, new ValueProcedure());
 		
 		for(Resource r : existingInternalMap.valueCollection()) {
-			graph.deny(r, InstanceOf, null, ExternalEntity, null);
+			try {
+				graph.deny(r, InstanceOf, null, ExternalEntity, null);
+			} catch (DatabaseException e) {
+				graph.deny(r, InstanceOf, null, ExternalEntity, vg);
+			}
 		}
 		
 	}