Always set the current hash when inserting.

[jSite.git] / src / de / todesbaum / jsite / application / ProjectInserter.java

diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java
index acd93db..158a0bb 100644 (file)
--- a/src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/src/de/todesbaum/jsite/application/ProjectInserter.java
@@ -280,12 +280,13 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                String filename = file.getFilename();
                FileOption fileOption = project.getFileOption(filename);
                if (fileOption.isInsert()) {
+                       fileOption.setCurrentHash(file.getHash());
                        /* check if file was modified. */
                        if (file.getHash().equals(fileOption.getLastInsertHash())) {
                                /* only insert a redirect. */
-                               return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + project.getEdition() + "/" + filename);
+                               logger.log(Level.FINE, String.format("Inserting redirect to edition %d for %s.", fileOption.getLastInsertEdition(), filename));
+                               return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + filename);
                        }
-                       fileOption.setCurrentHash(file.getHash());
                        try {
                                long[] fileLength = new long[1];
                                InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength);
@@ -375,7 +376,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
         */
        public void run() {
                fireProjectInsertStarted();
-               List<String> files = fileScanner.getFiles();
+               List<ScannedFile> files = fileScanner.getFiles();
 
                /* create connection to node */
                synchronized (lockObject) {
@@ -465,6 +466,7 @@ public class ProjectInserter implements FileScannerListener, Runnable {
                        int newEdition = Integer.parseInt(editionPart);
                        project.setEdition(newEdition);
                        project.setLastInsertionTime(System.currentTimeMillis());
+                       project.copyHashes();
                }
                fireProjectInsertFinished(success, cancelled ? new AbortedException() : (disconnected ? new IOException("Connection terminated") : null));
        }