From 664164ce9bd94f363aff220a1a8b696989438b66 Mon Sep 17 00:00:00 2001
From: Michael Wilson
Date: Fri, 31 Oct 2014 10:01:06 +0100
Subject: -image templates are now listed a such, independently of the logged
 in user -Lectures can now be connected to image templates

---
 dozentenmodulserver/src/main/java/sql/SQL.java | 60 +++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 10 deletions(-)

(limited to 'dozentenmodulserver/src/main/java/sql/SQL.java')

diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index e79cf159..cf2f3949 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -428,12 +428,16 @@ public class SQL {
 
 			stm = con.createStatement();
 
-			// ResultSet
-			ResultSet res = stm
-					.executeQuery("SELECT DISTINCT vl.GUID_imageID, vl.imageVersion, vl.image_name, vl.cond_hasLicenseRestriction, os.name, os.architecture,  '' as lecture, vl.image_update_time,  Concat(u.Nachname,' ',u.Vorname) as user,  vl.image_isTemplate FROM  bwLehrpool.pm_VLData_image pmi,  bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os,  bwLehrpool.m_user u WHERE pmi.userID='"
-							+ userID
-							+ "' AND u.userID = pmi.userID AND pmi.link_allowed = 1 AND pmi.GUID_imageID = vl.GUID_imageID AND vl.content_operatingSystem=os.operatingSystemID;");
-
+			// ResultSet WITHOUT templates
+			//ResultSet res = stm
+			//		.executeQuery("SELECT DISTINCT vl.GUID_imageID, vl.imageVersion, vl.image_name, vl.cond_hasLicenseRestriction, os.name, os.architecture,  '' as lecture, vl.image_update_time,  Concat(u.Nachname,' ',u.Vorname) as user,  vl.image_isTemplate FROM  bwLehrpool.pm_VLData_image pmi,  bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os,  bwLehrpool.m_user u WHERE pmi.userID='"
+			//				+ userID
+			//				+ "' AND u.userID = pmi.userID AND (pmi.link_allowed=1 OR vl.image_isTemplate=1) AND pmi.GUID_imageID = vl.GUID_imageID AND vl.content_operatingSystem=os.operatingSystemID;");
+
+			// ResultSet WITH templates
+						ResultSet res = stm
+								.executeQuery("SELECT DISTINCT vl.GUID_imageID,	vl.imageVersion, vl.image_name, vl.image_description, vl.cond_hasLicenseRestriction, os.name, os.architecture, '' as lecture, vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user, vl.image_isTemplate FROM bwLehrpool.pm_VLData_image pmi, bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u WHERE (vl.image_isTemplate=1 OR (pmi.userID='"+userID+"' AND pmi.link_allowed=1)) AND vl.image_owner=u.userID AND pmi.GUID_imageID = vl.GUID_imageID AND vl.content_operatingSystem=os.operatingSystemID;");
+			
 			while (res.next()) {
 				list.add(new Image(
 						res.getString("GUID_imageID"),
@@ -485,9 +489,6 @@ public class SQL {
 						res.getString("image_description")
 						)
 				);
-				
-				
-				
 			}
 			con.close();
 		} catch (SQLException e) {
@@ -495,7 +496,46 @@ public class SQL {
 			e.printStackTrace();
 		}
 		return list;
-	}
+	}//end getImageListPermissionAdmin
+	
+	
+	
+	public List<Image> getImageListAllTemplates(){
+		Connection con = getConnection();
+		Statement stm;
+
+		List<Image> list = new ArrayList<Image>();
+		try {
+
+			stm = con.createStatement();
+
+			// ResultSet
+			ResultSet res = stm
+					.executeQuery("SELECT DISTINCT vl.GUID_imageID, vl.imageVersion, vl.image_name, vl.image_description, vl.cond_hasLicenseRestriction, os.name, os.architecture,  '' as lecture, vl.image_update_time,  Concat(u.Nachname,' ',u.Vorname) as user,  vl.image_isTemplate FROM  bwLehrpool.pm_VLData_image pmi,  bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os,  bwLehrpool.m_user u WHERE vl.image_isTemplate=1 AND vl.content_operatingSystem=os.operatingSystemID AND vl.image_owner=u.userID;");
+
+			while (res.next()) {
+				list.add(new Image(
+						res.getString("GUID_imageID"),
+						res.getString("imageVersion"),
+						res.getString("image_name"),
+						res.getString("cond_hasLicenseRestriction"),
+						res.getString("name") + " "	+ res.getString("architecture") + " bit",
+						res.getString("lecture"),
+						res.getString("image_update_time"),
+						res.getString("user"),
+						res.getString("image_isTemplate"),
+						res.getString("image_description")
+						)
+				);
+			}
+			con.close();
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return list;
+	}//end getImageListAllTemplates
+	
 	
 	
 
-- 
cgit v1.2.3-55-g7522