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

Conflicts:
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class
	Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
	Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class

1 files changed, 61 insertions, 27 deletions

diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 52cbefb9..69843988 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -6,6 +6,10 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;

 import java.util.Date;

 import java.util.Random;

+import java.util.UUID;

+

+import models.Configuration;

+

 import org.apache.log4j.Logger;

 import server.BinaryListener;

 

@@ -23,7 +27,7 @@ public class SQL {
 		}

 		try {

 			Connection con = DriverManager

-					.getConnection("jdbc:mysql://127.0.0.1/bwLehrpool?user=root&password=slx-ng-open");

+					.getConnection("jdbc:mysql://"+Configuration.config.getSql_connection()+"?user="+Configuration.config.getSql_user()+"&password="+Configuration.config.getSql_pass()+"");

 			con.setAutoCommit(false);

 			log.info(new Date() + " - Connection returned to Client.");

 			return con;

@@ -45,7 +49,7 @@ public class SQL {
 							+ user

 							+ "',SHA1('"

 							+ pass

-							+ "'),'10001','12345','/srv/openslx/nfs/temp');");

+							+ "'),'10001','12345','"+Configuration.config.getAbsolute_path()+"temp/');");

 			con.commit();

 			log.info(new Date() + " - created FTPUser " + user + " : " + pass

 					+ ".");

@@ -114,7 +118,7 @@ public class SQL {
 		return null;

 	}

 

-	public int setInstitution(Connection con, String university) {

+	public String setInstitution(Connection con, String university) {

 		try {

 			Statement stm = con.createStatement();

 

@@ -122,8 +126,8 @@ public class SQL {
 					.executeQuery("SELECT * FROM bwLehrpool.m_institution where name like'"

 							+ university + "';");

 			if (ret.next() == false) {

-				Random rand = new Random();

-				int id = rand.nextInt();

+				

+				String id = UUID.randomUUID().toString();

 				stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_institution`(`institutionID`,`name`)VALUES('"

 						+ id + "','" + university + "');");

 				con.commit();

@@ -131,9 +135,9 @@ public class SQL {
 						.executeQuery("SELECT institutionID FROM bwLehrpool.m_institution WHERE name like '"

 								+ university + "';");

 				rs.next();

-				return rs.getInt("institutionID");

+				return rs.getString("institutionID");

 			} else {

-				return ret.getInt("institutionID");

+				return ret.getString("institutionID");

 			}

 

 		} catch (SQLException e) {

@@ -141,11 +145,11 @@ public class SQL {
 			log.info(new Date() + " - Failed to setInstitution.");

 			e.printStackTrace();

 		}

-		return -1;

+		return "-1";

 	}

 

-	public int setPerson(Connection con, String login, String lastname,

-			String firstname, String mail, Date lastlogin, int Institution) {

+	public String setPerson(Connection con, String login, String lastname,

+			String firstname, String mail, Date lastlogin, String Institution) {

 		DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

 		try {

 			Statement stm = con.createStatement();

@@ -156,9 +160,10 @@ public class SQL {
 							+ "' and Vorname like '"

 							+ firstname

 							+ "';");

+			

 			if (ret.next() == false) {

-				Random rand = new Random();

-				int id = rand.nextInt();

+				

+				String id = UUID.randomUUID().toString();

 				stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_user`(`userID`,`loginName`,`nachname`,`vorname`,`mail`,`lastLogin`,`institution`)VALUES('"

 						+ id

 						+ "','"

@@ -182,9 +187,10 @@ public class SQL {
 								+ firstname

 								+ "';");

 				rs.next();

-				return rs.getInt("userID");

+				return rs.getString("userID");

 			} else {

-				return ret.getInt("userID");

+				ret.first();

+				return ret.getString("userID");

 			}

 

 		} catch (SQLException e) {

@@ -192,12 +198,12 @@ public class SQL {
 			log.info(new Date() + " - Failed to setPerson.");

 			e.printStackTrace();

 		}

-		return -1;

+		return "-1";

 	}

 

-	public boolean setImageData(Connection con, int pk_person, boolean license,

+	public boolean setImageData(Connection con, String pk_person, boolean license,

 			boolean internet, long cpu, long ram, String imagename,

-			String imagePath) {

+			String imagePath, boolean isTemplate, long filesize) {

 

 		DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

 

@@ -212,9 +218,9 @@ public class SQL {
 

 		try {

 			Statement stm = con.createStatement();

-			Random random = new Random();

-			int uid = random.nextInt();

-			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`)VALUES('"

+			

+			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`)VALUES('"

 					+ uid // GUID_imageID

 					+ "',1,'" // imageVersion

 					+ imagename // image_name

@@ -240,6 +246,8 @@ public class SQL {
 					+ "','" + internet_bol // cond_hasInternetRestriction

 					+ "','" + ram // cond_minRAM

 					+ "','" + cpu // cond_minCPUs

+					+ "','" + isTemplate //image_isTemplate

+					+ "','" + filesize //image_filesize

 					+ "');");

 			con.commit();

 

@@ -316,7 +324,7 @@ public class SQL {
 		return null;

 	}

 

-	public int setLectureData(Connection con, int pk_person, int pk_image,

+	public int setLectureData(Connection con, String pk_person, String pk_image,

 			int imageversion, String name, String desc, String shortdesc,

 			String start, String end, boolean isactive) {

 

@@ -328,8 +336,8 @@ public class SQL {
 		}

 		try {

 			Statement stm = con.createStatement();

-			Random random = new Random();

-			int uid = random.nextInt();

+			

+			String uid = UUID.randomUUID().toString();

 			stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_lecture`(`lectureID`,`name`,`isActive`,`startTime`,`endTime`,`lastUsed`,`shortDescription`,`description`,`imageID`,`imageVersion`,`admin_createTime`,`admin_changeTime`,`admin_owner`,`admin_change_by`)VALUES('"

 					+ uid

 					+ "','"

@@ -386,7 +394,6 @@ public class SQL {
 	public ResultSet getImageData(Connection con, String id, String version) {

 		try {

 			Statement stm = con.createStatement();

-			System.out.println("Test");

 			return stm

 					.executeQuery("SELECT image_name,cond_hasInternetRestriction,cond_hasLicenseRestriction, cond_minCPUs, cond_minRAM FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"

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

@@ -398,9 +405,9 @@ public class SQL {
 		return null;

 	}

 

-	public int UpdateImageData(Connection con, String name, String newName,

+	public int UpdateImageData(Connection con, String name, String newName,String image_path,

 			boolean license, boolean internet, long cpu, long ram, String id,

-			String version) {

+			String version, boolean isTemplate, long filesize) {

 		try {

 			DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

 			Statement stm = con.createStatement();

@@ -420,6 +427,8 @@ public class SQL {
 					+ newVersion

 					+ "',`image_name` = '"

 					+ newName

+					+ "',`image_path` = '"

+					+ image_path

 					+ "',`image_update_time` = '"

 					+ formatter.format(new Date())

 					+ "',`rec_change_time` = '"

@@ -432,6 +441,10 @@ public class SQL {
 					+ ram

 					+ "',`cond_minCPUs` = '"

 					+ cpu

+					+ "',`image_isTemplate` = '"

+					+ isTemplate

+					+ "',`image_filesize` = '"

+					+ filesize

 					+ "' WHERE `GUID_imageID` = '"

 					+ id

 					+ "' AND `imageVersion` = '" + version + "';");

@@ -467,7 +480,7 @@ public class SQL {
 		return false;

 	}

 

-	public int updateLectureData(Connection con, int pk_image,

+	public int updateLectureData(Connection con, String pk_image,

 			int imageversion, String name, String newName, String desc,

 			String shortdesc, String start, String end, boolean isactive,

 			String id) {

@@ -498,6 +511,7 @@ public class SQL {
 					+ formatter.format(new Date())

 					+ "'WHERE `lectureID` = '" + id + "';");

 			con.commit();

+			log.info(new Date() + " - Succeeded to updateLectureData.");

 

 		} catch (SQLException e) {

 			// TODO Auto-generated catch block

@@ -592,4 +606,24 @@ public class SQL {
 

 		return null;

 	}

+	

+	public int UpdateImagePath(Connection con, String name) {

+		try {

+

+			Statement stm = con.createStatement();

+			String image_path="prod/"+name;

+			

+			stm.executeUpdate("UPDATE `bwLehrpool`.`m_VLData_imageInfo` SET `image_path` = '"

+					+ image_path

+					+ "' WHERE `image_path` = '"

+					+ "temp/"+name + "';");

+			con.commit();

+			return 0;

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

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

+			e.printStackTrace();

+		}

+		return -1;

+	}

 }