From 8d4b03c93bd64a3d71f806b83a99fde10bc089a0 Mon Sep 17 00:00:00 2001
From: Tobias Spitzer
Date: Fri, 15 Aug 2014 09:15:34 +0200
Subject: Suchmaske für Images neu

---
 Dozentenmodulserver/src/sql/SQL.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Dozentenmodulserver/src/sql')

diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index a642dd22..2922eafc 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -490,8 +490,7 @@ public class SQL {
 			Connection con=getConnection();
 			Statement stm = con.createStatement();
 			ResultSet data=stm
-					.executeQuery("SELECT image_name,cond_hasInternetRestriction,cond_hasLicenseRestriction, cond_minCPUs, cond_minRAM, image_syncMode,image_filesize,image_path, image_isTemplate,content_operatingSystem FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"
-							+ id + "' and imageVersion = '" + version + "' ;");
+					.executeQuery("SELECT i.image_name,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",
@@ -503,10 +502,10 @@ public class SQL {
 				map.put("filesize", data.getString("image_filesize"));
 				map.put("path", data.getString("image_path"));
 				map.put("template", data.getString("image_isTemplate"));
-				
-				String os_name=getOS(data.getString("content_operatingSystem"));
-				
-				map.put("os", os_name);
+				map.put("os",data.getString("GuestOS"));
+				map.put("owner", data.getString("Owner"));
+				map.put("lastupdate", data.getString("image_update_time"));
+
 			}
 			con.close();
 			return map;
-- 
cgit v1.2.3-55-g7522