X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FProjectInserter.java;h=d525ddbd69ae182797b0c51f5e84758d21937613;hb=f00de4e0d5ba4c14dc09ff84263563a7abc45cd9;hp=8ec92dbd2017836e587d08b0ac2919a637488644;hpb=6f1a8216cfba28add0ef365b46a08d16d4eb87fe;p=jSite.git

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index 8ec92db..d525ddb 100644
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -48,7 +48,7 @@ import de.todesbaum.util.io.StreamCopier;
 
 /**
  * @author David Roden <droden@gmail.com>
- * @version $Id: ProjectInserter.java 440 2006-03-30 09:31:25Z bombe $
+ * @version $Id: ProjectInserter.java 486 2006-04-27 10:58:34Z bombe $
  */
 public class ProjectInserter implements FileScannerListener, Runnable {
 
@@ -138,8 +138,8 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 		outputStream.addReplacement("$[EDITION]", String.valueOf(edition));
 		outputStream.addReplacement("$[URI]", project.getFinalURI(0));
 		for (int index = 1; index <= fileOption.getEditionRange(); index++) {
-		outputStream.addReplacement("$[URI+" + index + "]", project.getFinalURI(index));
 			outputStream.addReplacement("$[URI+" + index + "]", project.getFinalURI(index));
+			outputStream.addReplacement("$[EDITION+" + index + "]", String.valueOf(edition + index));
 		}
 		StreamCopier.copy(fileInput, outputStream, length[0]);
 		outputStream.close();
@@ -240,12 +240,19 @@ public class ProjectInserter implements FileScannerListener, Runnable {
 
 		/* create connection to node */
 		Connection connection = freenetInterface.getConnection("project-insert-" + counter++);
+		boolean connected = false;
+		Throwable cause = null;
 		try {
-			connection.connect();
+			connected = connection.connect();
 		} catch (IOException e1) {
-			fireProjectInsertFinished(false, e1);
+			cause = e1;
+		}
+		
+		if (!connected) {
+			fireProjectInsertFinished(false, cause);
 			return;
 		}
+		
 		Client client = new Client(connection);
 
 		/* create containers */