X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Futil%2FModelTransferableGraphSourceRequest.java;h=9832f9d08be6815f2aaa6c24f6e0d64910a54e22;hb=refs%2Fchanges%2F02%2F1402%2F2;hp=5760f1a026cfa7ab2a5a054c27e6311b13cfe6e1;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
index 5760f1a02..9832f9d08 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ModelTransferableGraphSourceRequest.java
@@ -81,7 +81,8 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
 
 	public static String LOG_FILE = "transferableGraph.log";
 	final static boolean LOG = false;
-	final static private boolean DEBUG = false;
+	final static boolean PRINTDEBUG = false;
+	final static boolean DEBUG = LOG | PRINTDEBUG;
 	final static boolean PROFILE = false;
 	
 	private TransferableGraphConfiguration2 configuration;
@@ -103,8 +104,10 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
 	}
 	
 	static void log(String line) {
+		if (PRINTDEBUG) System.err.println(line);
 		if (LOG) {
 			try {
+				if(line.length() > 500) line = line.substring(0, 500);
 				log.writeUTF(line + "\n");
 			} catch (IOException e) {
 				e.printStackTrace();
@@ -438,8 +441,12 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
 				state.externals.add(transientId);
 			} else if(ExtentStatus.PENDING == status) {
 				String uri = graph.getPossibleURI(r);
-				if(uri != null)
-					state.externals.add(transientId);
+				if(uri != null) {
+					// All internal resources with uri have been discovered already => this must then be external
+					//state.externals.add(transientId);
+					// Pending resources are found through weak links - if they are still pending at this stage do not add an external
+					processor.status.put(r, ExtentStatus.EXTERNAL);
+				}
 				else {
 					state.pending.add(transientId);
 					System.err.println("Pending status in export: " + NameUtils.getSafeName(graph, r, true) + " (" + graph.getPossibleURI(r) + ")");
@@ -447,6 +454,21 @@ public class ModelTransferableGraphSourceRequest extends UniqueRead<ModelTransfe
 			}
 		}
 
+		// Now that we know the status of the resources lets process weak statements 
+		for(Statement stm : processor.unresolvedWeakLinks) {
+			ExtentStatus status = processor.status.get(stm.getObject());
+			if(ExtentStatus.INTERNAL == status) {
+				// Weak links between internals are exported
+				int transientId = support.getTransientId(stm.getSubject());
+				processor.addToStream(stm.getPredicate(), stm.getObject());
+				try {
+					processor.flushStatementStream(transientId, state);
+				} catch (IOException e) {
+					throw new DatabaseException(e);
+				}
+			}
+		}
+
 		if (state.monitor.isCanceled())
 			throw new CancelTransactionException();