diff options
3 files changed, 18 insertions, 6 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index c6f0727d..b1fde196 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -453,7 +453,7 @@ public class DeleteImage_GUI extends JFrame { + "' konnte nicht gelöscht werden."); JOptionPane - .showConfirmDialog( + .showMessageDialog( c, "Image konnte nicht gelöscht werden.", "Fehler", @@ -467,7 +467,7 @@ public class DeleteImage_GUI extends JFrame { + "' konnte nicht von Server gelöscht werden."); JOptionPane - .showConfirmDialog( + .showMessageDialog( c, "Image konnte nicht vom Server gelöscht werden.", "Fehler", diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 2f94f55f..f918d0f4 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -723,8 +723,9 @@ public class FTPEditUploader_GUI extends JFrame implements //if a new file has been uploaded and new filename is set if (Image.image.getNewName() != null) { - // LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath=" - // + Image.image.getImagepath()); + LOGGER.debug("New file uploaded and new filename is set"); + //LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath()); + client.updateImageData( Image.image.getImagename(), Image.image.getImagename(), @@ -749,6 +750,7 @@ public class FTPEditUploader_GUI extends JFrame implements } else { //no new file uploaded and old file name stays //LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath()); + LOGGER.debug("old file should remain"); client.updateImageData( Image.image.getImagename(), @@ -783,13 +785,14 @@ public class FTPEditUploader_GUI extends JFrame implements // then, add user permissions as they have been set new for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) { - System.out.println("Writing additional rights for user " + /*System.out.println("Writing additional rights for user " + RightsManagement.rightsManagement .getPermittedUserList().get(i).getUserID() + ", User " + i + "/" + RightsManagement.rightsManagement.getPermittedUserList().size()); + */ client.writeAdditionalImageRights(Image.image.getImageId(), RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), 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.."); } } |