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=6d3f7e48e7d421a0e5fe7e444e453f585ce2dfd5;hp=06abd615fd5df6ffb65d393d498b4a84a458100d;hb=6c215230360024f9fc1ff6eaa50b180758b8fecb;hpb=f7acb1a086643d1a88cf7246fcc11d12c1703dd9

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 06abd615f..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
@@ -163,8 +163,8 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 	void addMissing(int handleIndex, String external) {
 		allMissingExternals.put(external, handleIndex);
 		Set<String> removals = new HashSet<>();
-		for(String ext : missingExternals) if(ext.startsWith(external)) return;
-		for(String ext : missingExternals) if(external.startsWith(ext)) removals.add(ext);
+		for(String ext : missingExternals) if(ext.startsWith(external + "/")) return;
+		for(String ext : missingExternals) if(external.startsWith(ext + "/")) removals.add(ext);
 		missingExternals.removeAll(removals);
 		missingExternals.add(external);
 	}
@@ -210,18 +210,18 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 		                                    TransientCacheAsyncListener.instance()); 
 							Resource child = childMap.get(def.name); 
 							if(child == null) {
-								addMissing(identity.resource, graph.getURI(parent) + "/" + def.name);
+								addMissing(identity.resource, graph.getURI(parent) + "/" + URIStringUtils.escape(def.name));
 							} else {
 								handles[identity.resource] = builder.handle(child);
 							}
 						} else {
-						    addMissing(identity.resource, TransferableGraphUtils.getURI(resourceCount, identityMap, def.parent) + "/" + def.name);
+						    addMissing(identity.resource, TransferableGraphUtils.getURI(resourceCount, identityMap, def.parent) + "/" + URIStringUtils.escape(def.name));
 						}
 					}
 				}
 			}
 			else if(definition instanceof Internal) {
-				String uri = TransferableGraphUtils.getTrueURI(resourceCount, identityMap, identity.resource);
+				String uri = TransferableGraphUtils.getURI(resourceCount, identityMap, identity.resource);
 				Resource existing = graph.getPossibleResource(uri);
 				if(existing != null) {
 					existingInternalMap.put(identity.resource, existing);
@@ -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;
 	}
 
@@ -288,6 +297,14 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 	void findClusterSet(WriteOnlyGraph graph, Resource rootLibrary, int[] clustering, int[] clusterSets, long[] clusters, int id) throws DatabaseException {
 		ClusteringSupport support = graph.getService(ClusteringSupport.class);
 		if(id == Extensions.ROOT_LIBRARY_CLUSTER_SET || id == Extensions.INDEX_ROOT_CLUSTER_SET) return;
+		Resource indexRootClusterSetResource = rootLibrary;
+		if(indexRoot != null && support.isClusterSet(indexRoot)) {
+			indexRootClusterSetResource = indexRoot;
+		} else {
+			graph.setClusterSet4NewResource(rootLibrary);
+			graph.flushCluster();			
+		}
+		int indexRootCsHandle = builder.handle(indexRootClusterSetResource);
 		for(int pos=0,index=0;index<clustering.length;index++) {
 			pos += clustering[index];
 			if(id < pos) {
@@ -297,7 +314,7 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 					if(cs == Extensions.ROOT_LIBRARY_CLUSTER_SET) csHandle = builder.handle(rootLibrary);
 					else if(cs == Extensions.INDEX_ROOT_CLUSTER_SET) {
 						if(indexRoot == null) throw new DatabaseException("No index root was available in TG import.");
-						csHandle = builder.handle(indexRoot);
+						csHandle = indexRootCsHandle;
 					}
 					else {
 						findClusterSet(graph, rootLibrary, clustering, clusterSets, clusters, cs);
@@ -331,11 +348,15 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 			Collections.sort(missing);
 			for(String uri : missing) {
 				String[] parts = URIStringUtils.splitURI(uri);
+				// URIStringUtils.splitURI returns root URI in non-standard format, so fix it manually as a workaround
+				if (parts[0].equals("http://")) {
+					parts[0] = "http:/";
+				}
 
 				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();
@@ -343,7 +364,7 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 
 				Resource nameResource = graph.newResource();
 				graph.claim(nameResource, InstanceOf, null, String);
-				graph.claimValue(nameResource, parts[1], WriteBindings.STRING);
+				graph.claimValue(nameResource, URIStringUtils.unescape(parts[1]), WriteBindings.STRING);
 				graph.claim(childResource, HasName, NameOf, nameResource);
 
 				graph.claim(parent, ConsistsOf, PartOf, childResource);
@@ -445,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);