diff options
| author | Tobias Spitzer | 2014-05-23 08:01:39 +0200 |
|---|---|---|
| committer | Tobias Spitzer | 2014-05-23 08:01:39 +0200 |
| commit | ae6e282b6d4aed84516e97ddc9a5f349d284e975 (patch) | |
| tree | 4df4f9c73de2cf0f01734f5aea65bbd85ca218ed | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module (diff) | |
| download | tutor-module-ae6e282b6d4aed84516e97ddc9a5f349d284e975.tar.gz tutor-module-ae6e282b6d4aed84516e97ddc9a5f349d284e975.tar.xz tutor-module-ae6e282b6d4aed84516e97ddc9a5f349d284e975.zip | |
Bug: Fehler beim Download wirde behoben
| -rw-r--r-- | Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class | bin | 11192 -> 11247 bytes | |||
| -rw-r--r-- | Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 2 | ||||
| -rw-r--r-- | Dozentenmodulserver/bin/sql/SQL.class | bin | 22443 -> 22455 bytes | |||
| -rw-r--r-- | Dozentenmodulserver/src/sql/SQL.java | 1 |
4 files changed, 2 insertions, 1 deletions
diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class Binary files differindex 45ca0eae..30bcf2f4 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 97a29849..d09d6c03 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -390,7 +390,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener try { user = client.getFtpUser(); - downloadFile = client.getPathOfImage(Image.image.getImageId(), + downloadFile = user.path+"/"+client.getPathOfImage(Image.image.getImageId(), Image.image.getVersion()); } catch (TException e) { diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class Binary files differindex 8d982341..df7bf1f2 100644 --- a/Dozentenmodulserver/bin/sql/SQL.class +++ b/Dozentenmodulserver/bin/sql/SQL.class diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index c9c4fe4a..9a746093 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -120,6 +120,7 @@ public class SQL { + "' and imageVersion='"
+ version
+ "';");
+ rs.first();
String path=rs.getString("image_path");
con.close();
return path;
|