diff options
| author | Michael Wilson | 2014-11-17 14:57:28 +0100 |
|---|---|---|
| committer | Michael Wilson | 2014-11-17 14:57:28 +0100 |
| commit | 0fdf139a73909330f56837cbf17a5a53e223d456 (patch) | |
| tree | b8637eb48552c11f65717986d4880ace4e412873 | |
| parent | Navigation korrigiert (diff) | |
| download | tutor-module-0fdf139a73909330f56837cbf17a5a53e223d456.tar.gz tutor-module-0fdf139a73909330f56837cbf17a5a53e223d456.tar.xz tutor-module-0fdf139a73909330f56837cbf17a5a53e223d456.zip | |
-
3 files changed, 7 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index 133e078a..778fbed1 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -339,6 +339,8 @@ public class EditImageAllgemein_GUI extends JFrame { // Info LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" + Image.image.getImagename() + + ", NewImageName=\"" + + Image.image.getNewName() + "\", Imagebeschreibung=\"" + Image.image.getDesc()+"\""); diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index d36f3cb4..e4cfb8fa 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -678,6 +678,7 @@ public class FTPEditUploader_GUI extends JFrame implements client.updateImageData(Image.image.getImagename(), Image.image.getImagename(), Image.image.getDesc(), "temp/" + Image.image.getNewName(), + //"temp/" + Image.image.getImagename(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), Image.image.getImageId(), Image.image.getVersion(), @@ -686,6 +687,7 @@ public class FTPEditUploader_GUI extends JFrame implements if (fileupload == true) { client.startFileCopy(Image.image.getNewName()); + //client.startFileCopy(Image.image.getImagename()); } } diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index 83bd2ccb..6f04d156 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -1239,8 +1239,9 @@ public class SQL { Connection con = getConnection();
Statement stm = con.createStatement();
ResultSet data = stm
- .executeQuery("select l.name, l.isActive, l.startTime, l.endTime, l.lastUsed, l.description, i.image_path, l.imageVersion, concat(u.Nachname,' ',u.Vorname) as owner from m_VLData_lecture l, m_user u, m_VLData_imageInfo i where l.admin_owner=u.userID and l.imageID=i.GUID_imageID and lectureID= '"
- + id + "' ;");
+ //.executeQuery("select l.name, l.isActive, l.startTime, l.endTime, l.lastUsed, l.description, i.image_path, l.imageVersion, concat(u.Nachname,' ',u.Vorname) as owner from m_VLData_lecture l, m_user u, m_VLData_imageInfo i where l.admin_owner=u.userID and l.imageID=i.GUID_imageID and lectureID= '"
+ .executeQuery("select l.name, l.isActive, l.startTime, l.endTime, l.lastUsed, l.description, i.image_path, i.imageVersion, concat(u.Nachname,' ',u.Vorname) as owner from m_VLData_lecture l, m_user u, m_VLData_imageInfo i where l.admin_owner=u.userID and l.imageID=i.GUID_imageID and lectureID= '"
+ + id + "' ;");
while (data.next()) {
map.put("name", data.getString("name"));
map.put("isActive", data.getString("isActive"));
|
