From 515e5b984f573d8ff2f5d3253a1ffc2b8b450ce3 Mon Sep 17 00:00:00 2001
From: Tobias Spitzer
Date: Wed, 20 Aug 2014 11:20:24 +0200
Subject: Neueste Version

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

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

diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 15d6950f..461a372b 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -599,7 +599,7 @@ public class SQL {
 	}
 
 	public int updateLectureData(String pk_image,
-			int imageversion, String name, String newName, String desc,
+			String imageversion, String name, String newName, String desc,
 			String shortdesc, String start, String end, boolean isactive,
 			String id) {
 
@@ -837,21 +837,18 @@ 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 + "' ;");
+					.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 + "' ;");
 			while (data.next()) {
-				map.put("name", data.getString("image_name"));
-				map.put("internet",
-						data.getString("cond_hasInternetRestriction"));
-				map.put("license", data.getString("cond_hasLicenseRestriction"));
-				map.put("cpu", data.getString("cond_minCPUs"));
-				map.put("ram", data.getString("cond_minRAM"));
-				map.put("shareMode", data.getString("image_syncMode"));
-				map.put("filesize", data.getString("image_filesize"));
-				map.put("path", data.getString("image_path"));
-				map.put("template", data.getString("image_isTemplate"));
-				map.put("os",data.getString("GuestOS"));
+				map.put("name", data.getString("name"));
+				map.put("isActive",
+						data.getString("isActive"));
+				map.put("startTime", data.getString("startTime"));
+				map.put("endTime", data.getString("endTime"));
+				map.put("lastUsed", data.getString("lastUsed"));
+				map.put("desc", data.getString("description"));
+				map.put("imagepath", data.getString("image_path"));
+				map.put("imageversion", data.getString("imageVersion"));
 				map.put("owner", data.getString("Owner"));
-				map.put("lastupdate", data.getString("image_update_time"));
 
 			}
 			con.close();
-- 
cgit v1.2.3-55-g7522