summaryrefslogtreecommitdiffstats
path: root/Dozentenmodulserver/src/sql/SQL.java
diff options
context:
space:
mode:
authorTobias Spitzer2014-08-22 08:05:43 +0200
committerTobias Spitzer2014-08-22 08:05:43 +0200
commitb0d8aefbbfa3cf9d70112994d29f0bc12b97fbb0 (patch)
tree243d09c47b217d11bf96394c2c1df26e27ea7eec /Dozentenmodulserver/src/sql/SQL.java
parentDeleted dead code and show version number in server log file (diff)
downloadtutor-module-b0d8aefbbfa3cf9d70112994d29f0bc12b97fbb0.tar.gz
tutor-module-b0d8aefbbfa3cf9d70112994d29f0bc12b97fbb0.tar.xz
tutor-module-b0d8aefbbfa3cf9d70112994d29f0bc12b97fbb0.zip
z
Diffstat (limited to 'Dozentenmodulserver/src/sql/SQL.java')
-rw-r--r--Dozentenmodulserver/src/sql/SQL.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 36038e4a..f763eacd 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -491,7 +491,7 @@ public class SQL {
Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet data=stm
- .executeQuery("SELECT i.image_name,i.image_description,i.image_update_time,i.cond_hasInternetRestriction,i.cond_hasLicenseRestriction, i.cond_minCPUs,i.cond_minRAM, i.image_syncMode,i.image_filesize,i.image_path, i.image_isTemplate,os.GuestOS, concat(u.Nachname,' ',u.Vorname) as Owner FROM bwLehrpool.m_VLData_imageInfo i,bwLehrpool.m_user u,bwLehrpool.m_operatingSystem os where i.image_owner=u.userID and i.content_operatingSystem=os.operatingSystemID and GUID_imageID = '" + id + "' and imageVersion = '" + version + "' ;");
+ .executeQuery("SELECT i.GUID_imageID, i.imageVersion, i.image_name,i.image_description,i.image_update_time,i.cond_hasInternetRestriction,i.cond_hasLicenseRestriction, i.cond_minCPUs,i.cond_minRAM, i.image_syncMode,i.image_filesize,i.image_path, i.image_isTemplate,os.GuestOS, concat(u.Nachname,' ',u.Vorname) as Owner FROM bwLehrpool.m_VLData_imageInfo i,bwLehrpool.m_user u,bwLehrpool.m_operatingSystem os where i.image_owner=u.userID and i.content_operatingSystem=os.operatingSystemID and GUID_imageID = '" + id + "' and imageVersion = '" + version + "' ;");
while (data.next()) {
map.put("name", data.getString("image_name"));
map.put("internet",
@@ -507,6 +507,8 @@ public class SQL {
map.put("owner", data.getString("Owner"));
map.put("lastupdate", data.getString("image_update_time"));
map.put("desc", data.getString("image_description"));
+ map.put("id", data.getString("GUID_imageID"));
+ map.put("version", data.getString("imageVersion"));
}
con.close();