From d07c7effb917fdb0e6092761b4c0d0f42c3895f7 Mon Sep 17 00:00:00 2001
From: unknown
Date: Wed, 26 Feb 2014 16:28:11 +0100
Subject: -Suchfenster verbessert 	- On The Fly nach Name funktioniert
 nun 	- Tab Meine Images nun Funktionsfähig -Möglichkeit der Konfiguration
 der Anwendung ist geschaffen, somit können die beiden GUIs BillOfRights und
 der Link zu vmware player für immer ausgeblendet werden -Thrift ist nun
 fertig implementiert

---
 Dozentenmodulserver/src/sql/SQL.java | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'Dozentenmodulserver/src/sql')

diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index b07de35b..9f9ba352 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -191,11 +191,11 @@ public class SQL {
 		
 	}
 	
-	public ResultSet getImageListWithoutLectures(Connection con){
+	public ResultSet getImageList(Connection con){
 		try {
 			Statement stm=con.createStatement();
 			
-			return stm.executeQuery("SELECT distinct vl.image_name, vl.cond_hasLicenseRestriction, os.name, '',vl.image_update_time,  Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID;");
+			return stm.executeQuery("SELECT vl.image_name, vl.cond_hasLicenseRestriction, os.name, '' as lecture,vl.image_update_time,  Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID and vl.image_name not in (SELECT vl.image_name FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID) union SELECT vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name as lecture,  vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");
 			
 			
 		} catch (SQLException e) {
@@ -205,19 +205,6 @@ public class SQL {
 		return null;
 	}
 	
-	public ResultSet getImageListWithLectures(Connection con){
-		try {
-			Statement stm=con.createStatement();
-			
-			return stm.executeQuery("SELECT vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name as lecture,  vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");
-			
-			
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return null;
-	}
 	
 	public ResultSet getAllOS(Connection con)
 	{
-- 
cgit v1.2.3-55-g7522