X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.graph.db%2Fsrc%2Forg%2Fsimantics%2Fgraph%2Fdb%2FStreamingTransferableGraphImportProcess.java;h=6d3f7e48e7d421a0e5fe7e444e453f585ce2dfd5;hb=refs%2Fchanges%2F72%2F1672%2F1;hp=9a819635463a8703651465c312bc688b3622326f;hpb=c8d17ec86ad48f769923d1e674e2755471e20189;p=simantics%2Fplatform.git

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..6d3f7e48e 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
@@ -244,18 +244,27 @@ 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;
 	}
 
@@ -347,7 +356,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 +466,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);