From e6a9445d56c676dbf55efd2100b8a07774f4c7e3 Mon Sep 17 00:00:00 2001
From: Tobias Spitzer
Date: Thu, 21 Aug 2014 11:03:00 +0200
Subject: Beschreibung

---
 Dozentenmodulserver/src/sql/SQL.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'Dozentenmodulserver/src/sql/SQL.java')

diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 461a372b..36038e4a 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -232,7 +232,7 @@ public class SQL {
 	}
 
 	public boolean setImageData(String pk_person, boolean license,
-			boolean internet, long cpu, long ram, String imagename,
+			boolean internet, long cpu, long ram, String imagename,String desc,
 			String imagePath, boolean isTemplate, long filesize, String shareMode, String pk_os) {
 
 		DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@@ -251,10 +251,11 @@ public class SQL {
 			Statement stm = con.createStatement();
 			
 			String uid = UUID.randomUUID().toString();
-			stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`,`image_syncMode`)VALUES('"
+			stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_description`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`,`image_syncMode`)VALUES('"
 					+ uid // GUID_imageID
 					+ "',1,'" // imageVersion
 					+ imagename // image_name
+					+ "','" +desc //image_description
 					+ "','" + imagePath // image_path
 					+ "','" + formatter.format(new Date()) // image_lastCall
 					+ "','" + formatter.format(new Date()) // image_create_time
@@ -490,7 +491,7 @@ public class SQL {
 			Connection con=getConnection();
 			Statement stm = con.createStatement();
 			ResultSet data=stm
-					.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 + "' ;");
+					.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 + "' ;");
 			while (data.next()) {
 				map.put("name", data.getString("image_name"));
 				map.put("internet",
@@ -505,6 +506,7 @@ public class SQL {
 				map.put("os",data.getString("GuestOS"));
 				map.put("owner", data.getString("Owner"));
 				map.put("lastupdate", data.getString("image_update_time"));
+				map.put("desc", data.getString("image_description"));
 
 			}
 			con.close();
@@ -517,7 +519,7 @@ public class SQL {
 		return null;
 	}
 
-	public int UpdateImageData(String name, String newName,String image_path,
+	public int UpdateImageData(String name, String newName,String desc,String image_path,
 			boolean license, boolean internet, long cpu, long ram, String id,
 			String version, boolean isTemplate, long filesize, String shareMode,String ospk) {
 		try {
@@ -540,6 +542,8 @@ public class SQL {
 					+ newVersion
 					+ "',`image_name` = '"
 					+ newName
+					+ "',`image_description` = '"
+					+ desc
 					+ "',`image_path` = '"
 					+ image_path
 					+ "',`image_update_time` = '"
-- 
cgit v1.2.3-55-g7522