diff options
| author | unknown | 2014-04-25 09:50:41 +0200 |
|---|---|---|
| committer | unknown | 2014-04-25 09:50:41 +0200 |
| commit | f5a18cfc3c0eeedf43e5d688df5471d7369226de (patch) | |
| tree | a7e232f31e1e0e8b8fc90d1045b5d03ef5d0a265 | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module (diff) | |
| download | tutor-module-f5a18cfc3c0eeedf43e5d688df5471d7369226de.tar.gz tutor-module-f5a18cfc3c0eeedf43e5d688df5471d7369226de.tar.xz tutor-module-f5a18cfc3c0eeedf43e5d688df5471d7369226de.zip | |
Delete Image funktioniert
| -rw-r--r-- | Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | bin | 12396 -> 12396 bytes | |||
| -rw-r--r-- | Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 1 | ||||
| -rw-r--r-- | Dozentenmodulserver/bin/server/ServerHandler.class | bin | 14495 -> 14648 bytes | |||
| -rw-r--r-- | Dozentenmodulserver/bin/sql/SQL.class | bin | 16026 -> 16134 bytes | |||
| -rw-r--r-- | Dozentenmodulserver/src/server/ServerHandler.java | 8 | ||||
| -rw-r--r-- | Dozentenmodulserver/src/sql/SQL.java | 6 |
6 files changed, 9 insertions, 6 deletions
diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class Binary files differindex e429fcd8..d7c2577d 100644 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 66dfc344..9956f677 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -411,6 +411,7 @@ public class DeleteImage_GUI extends JFrame { System.out.println(imageid); System.out.println(imageversion); try { + client.deleteImageServer(imageid, imageversion); if (client.deleteImageData(imageid, imageversion)) { // if (client.deleteImageServer(imageid diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class Binary files differindex 95ad3b3f..54ca916e 100644 --- a/Dozentenmodulserver/bin/server/ServerHandler.class +++ b/Dozentenmodulserver/bin/server/ServerHandler.class diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class Binary files differindex 83234945..90d26bae 100644 --- a/Dozentenmodulserver/bin/sql/SQL.class +++ b/Dozentenmodulserver/bin/sql/SQL.class diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 5e736554..f9450107 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -382,17 +382,17 @@ public class ServerHandler implements Server.Iface { public boolean deleteImageServer(String imageid, String imageversion) throws TException{ String stringFile = sql.getFile(con, imageid, imageversion); - - File tmpFile = new File("127.0.0.1:" + stringFile); + log.info(new Date()+" - File to Delete: "+stringFile); + File tmpFile = new File(stringFile); try { //File wird von Server gelöscht FileUtils.forceDelete(tmpFile); - + log.info(new Date()+" - Delete Successful"); return true; } catch (IOException e) { - // TODO Auto-generated catch block + log.info(new Date()+" - Delete Failed"); e.printStackTrace(); } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index d85068e8..143efb78 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -544,8 +544,10 @@ public class SQL { try {
Statement stm = con.createStatement();
- return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo WHERE imageID = '" + imageid
- + "' AND imageVersion = '" + imageversion + "';").toString();
+ ResultSet rs=stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo WHERE GUID_imageID = '" + imageid
+ + "' AND imageVersion = '" + imageversion + "';");
+ rs.next();
+ return rs.getString("image_path");
} catch (SQLException e) {
// TODO Auto-generated catch block
|