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=4894467e3d1260aa25d4239349942542000ede22;hb=d26148afe7f72dad8eee04764a866b6bdd201c8e;hp=524885f5d57a71ba291579c0942f1e0cdff3945f;hpb=57f274203cf0046f2680fdb201759fe4f30ace34;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 524885f5d..4894467e3 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
@@ -221,7 +221,7 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 				}
 			}
 			else if(definition instanceof Internal) {
-				String uri = TransferableGraphUtils.getURI(resourceCount, identityMap, identity.resource);
+				String uri = TransferableGraphUtils.getTrueURI(resourceCount, identityMap, identity.resource);
 				Resource existing = graph.getPossibleResource(uri);
 				if(existing != null) {
 					existingInternalMap.put(identity.resource, existing);
@@ -288,6 +288,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 +305,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,10 +339,16 @@ 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("!!");
+				if(parent == null) {
+					throw new IllegalStateException("!!");
+				}
 
 				Resource childResource = graph.newResource();
 				graph.claim(childResource, InstanceOf, null, ExternalEntity);