Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module into maven

Conflicts:
	Dozentenmodul/.classpath
	Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/intro/Login_GUI.class
	Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
	Dozentenmodul/src/gui/lecture/ExtendedSearchForLectures_GUI.java
	Dozentenmodul/src/main/java/gui/lecture/ExtendedSearchForImages_GUI.java
	Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class
	Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class
	Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_args.class
	Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$updateImageData_args.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$updateImageData_result.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class
	Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class
	Dozentenmodulserver/bin/server/Server$writeVLdata_args.class
	Dozentenmodulserver/bin/sql/SQL.class

1 files changed, 24 insertions, 1 deletions

diff --git a/Dozentenmodulserver/src/main/java/sql/SQL.java b/Dozentenmodulserver/src/main/java/sql/SQL.java
index 98fc8ef7..ec768a40 100644
--- a/Dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/Dozentenmodulserver/src/main/java/sql/SQL.java
@@ -487,7 +487,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 FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"

+					.executeQuery("SELECT image_name,cond_hasInternetRestriction,cond_hasLicenseRestriction, cond_minCPUs, cond_minRAM, image_syncMode,image_filesize,image_path, image_isTemplate FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"

 							+ id + "' and imageVersion = '" + version + "' ;");

 			while (data.next()) {

 				map.put("name", data.getString("image_name"));

@@ -499,6 +499,7 @@ public class SQL {
 				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"));

 			}

 			con.close();

 			return map;

@@ -750,4 +751,26 @@ public class SQL {
 		}

 		return -1;

 	}

+	

+	public List<String> getAllUniversities() {

+		List<String> list = new ArrayList<>();

+		try {

+			Connection con=getConnection();

+			Statement stm = con.createStatement();

+			ResultSet rs=stm

+					.executeQuery("SELECT name FROM bwLehrpool.m_institution;");

+			while (rs.next()) {

+				list.add(rs.getString("name"));

+			}

+			return list;

+			

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			log.info(new Date() + " - Failed to getAllUniversities.");

+			e.printStackTrace();

+		}

+

+		return null;

+

+	}

 }