diff options
author | Nino Breuer | 2014-12-11 12:26:18 +0100 |
---|---|---|
committer | Nino Breuer | 2014-12-11 12:26:18 +0100 |
commit | 0c9b00b492d41fbac64dc3423c30087345edf149 (patch) | |
tree | 12ab619e09ed7328debc80cfed559ec589898c50 /dozentenmodulserver | |
parent | d (diff) | |
parent | • [Client] fixed incorrect JOptionPane (diff) | |
download | tutor-module-0c9b00b492d41fbac64dc3423c30087345edf149.tar.gz tutor-module-0c9b00b492d41fbac64dc3423c30087345edf149.tar.xz tutor-module-0c9b00b492d41fbac64dc3423c30087345edf149.zip |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodulserver')
-rw-r--r-- | dozentenmodulserver/src/main/java/server/ServerHandler.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java index 0deb1037..ebba88e1 100644 --- a/dozentenmodulserver/src/main/java/server/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java @@ -475,6 +475,9 @@ public class ServerHandler implements Server.Iface { //get old_image_path String old_image_path = sql.getFile(id, version); + //log.debug("old file path has value:"+old_image_path.substring(5)); + //log.debug("new file path has value:"+image_path.substring(5)); + String mode = null; @@ -492,13 +495,19 @@ public class ServerHandler implements Server.Iface { int val = sql.UpdateImageData(name, newName, desc, image_path, license, internet, cpu, ram, id, version, isTemplate, filesize, mode, pk_os); + + - if (val == 0) { + //check if new file has been uploaded by checking if the new file path equals the old file path + //if so, no new file was uploaded. Else delete old file + if (val == 0 && (!old_image_path.substring(5).matches(image_path.substring(5))) ) { // update was successful - delete old file + //log.debug("deleting file "+old_image_path); deleteImageByPath(old_image_path); } else { // update was not successful - delete new file // TODO not yet implemented + //log.debug("doing nothing because no new file was uploaded.."); } } |