Ausgaben geändert

5 files changed, 44 insertions, 55 deletions

diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class
index 0f7cee59..42ea92cd 100644
--- a/Dozentenmodulserver/bin/server/ServerHandler.class
+++ b/Dozentenmodulserver/bin/server/ServerHandler.class
diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class
index baa1a480..5a5d2593 100644
--- a/Dozentenmodulserver/bin/server/startServer.class
+++ b/Dozentenmodulserver/bin/server/startServer.class
diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class
index cfdf6004..0c9c6d45 100644
--- a/Dozentenmodulserver/bin/util/XMLCreator.class
+++ b/Dozentenmodulserver/bin/util/XMLCreator.class
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 0cafd182..e10d68a3 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -8,10 +8,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -28,7 +25,7 @@ import util.XMLCreator;
 
 public class ServerHandler implements Server.Iface {
 	static SQL sql = new SQL();
-	
+
 	private static Logger log = Logger.getLogger(ServerHandler.class);
 
 	@Override
@@ -38,15 +35,12 @@ public class ServerHandler implements Server.Iface {
 		user.setUserName(UUID.randomUUID().toString().substring(0, 8));
 		user.setPassword(getEncodedSha1Sum(UUID.randomUUID().toString()
 				.substring(0, 8)));
-		if(Configuration.config.getAbsolute_path().endsWith("/"))
-		{
+		if (Configuration.config.getAbsolute_path().endsWith("/")) {
 			user.setPath(Configuration.config.getAbsolute_path());
+		} else {
+			user.setPath(Configuration.config.getAbsolute_path() + "/");
 		}
-		else{
-			user.setPath(Configuration.config.getAbsolute_path()+"/");
-		}
-		
-		
+
 		// check if folder temp exists
 		if (folderTempExists() == true) {
 			sql.writeFTPUser(user.getUserName(), user.getPassword());
@@ -59,15 +53,11 @@ public class ServerHandler implements Server.Iface {
 
 	public boolean folderTempExists() {
 		// check if folder temp exists, otherwise create it
-		Path path=null;
-		if(Configuration.config.getAbsolute_path().endsWith("/"))
-		{
-			path = Paths
-					.get(Configuration.config.getAbsolute_path() + "temp");
-		}
-		else{
-			path = Paths
-					.get(Configuration.config.getAbsolute_path() + "/temp");
+		Path path = null;
+		if (Configuration.config.getAbsolute_path().endsWith("/")) {
+			path = Paths.get(Configuration.config.getAbsolute_path() + "temp");
+		} else {
+			path = Paths.get(Configuration.config.getAbsolute_path() + "/temp");
 		}
 
 		if (Files.exists(path) == true) {
@@ -83,9 +73,9 @@ public class ServerHandler implements Server.Iface {
 						+ "'");
 				return false;
 			} else {
-				//set permissions
+				// set permissions
 				try {
-					Runtime.getRuntime().exec("chmod 777 "+path);
+					Runtime.getRuntime().exec("chmod 777 " + path);
 				} catch (IOException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -117,7 +107,7 @@ public class ServerHandler implements Server.Iface {
 
 	@Override
 	public String getPathOfImage(String image_id, String version)
-			throws TException {		
+			throws TException {
 		log.info(new Date() + " - successfully returned PathOfImage: "
 				+ sql.getPathOfImage(image_id, version));
 		return sql.getPathOfImage(image_id, version);
@@ -136,8 +126,8 @@ public class ServerHandler implements Server.Iface {
 		String pk_person = sql.setPerson(login, lastname, firstname, Mail,
 				new Date(), pk_institution);
 
-		sql.setImageData(pk_person, license, internet, cpu, ram,
-				imagename, imagePath, isTemplate, filesize);
+		sql.setImageData(pk_person, license, internet, cpu, ram, imagename,
+				imagePath, isTemplate, filesize);
 
 		log.info(new Date() + " - written VLdata");
 		// TODO Auto-generated method stub
@@ -146,7 +136,7 @@ public class ServerHandler implements Server.Iface {
 
 	@Override
 	public List<Image> getImageList() throws TException {
-			return sql.getImageList();
+		return sql.getImageList();
 
 	}
 
@@ -178,11 +168,11 @@ public class ServerHandler implements Server.Iface {
 
 		map = sql.getImageIDandVersion(imagename);
 
-		pk_image=map.get("GUID");
-		imageversion=Integer.parseInt(map.get("version"));
+		pk_image = map.get("GUID");
+		imageversion = Integer.parseInt(map.get("version"));
 		sql.setLectureData(pk_person, pk_image, imageversion, name, desc,
 				shortdesc, startDate, endDate, isActive);
-		XMLCreator xml = new XMLCreator(sql.getConnection(),name);
+		XMLCreator xml = new XMLCreator(sql.getConnection(), name);
 		try {
 			xml.create(name);
 			log.info(new Date() + " - XML created.");
@@ -201,6 +191,7 @@ public class ServerHandler implements Server.Iface {
 
 	@Override
 	public boolean startFileCopy(String filename) throws TException {
+		//copy file from folder temp to folder prod
 		String file = Configuration.config.getAbsolute_path() + "temp/"
 				+ filename;
 		File tmpFile = new File(file);
@@ -209,17 +200,13 @@ public class ServerHandler implements Server.Iface {
 				+ " - Trying to move file to '/srv/openslx/nfs/prod/"
 				+ tmpFile.getName() + "'");
 		try {
-
-			// der übergebene Filename ist falsch - hier muss der generierte
-			// name geholt werden, nicht der ursprüngliche name. wo wird dieser
-			// eingelesen?
-
 			FileUtils.moveFile(tmpFile,
 					new File(Configuration.config.getAbsolute_path() + "prod/"
 							+ filename));
-			int ret = sql.UpdateImagePath(filename);
-			log.info(new Date() + " - update " + ret);
-			log.info(new Date() + " - file moved");
+			// int ret = sql.UpdateImagePath(filename);
+			if (sql.UpdateImagePath(filename) == 0) {
+				log.info(new Date() + " - file moved and database updated.");
+			}
 
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
@@ -232,8 +219,8 @@ public class ServerHandler implements Server.Iface {
 	@Override
 	public Map<String, String> getImageData(String imageid, String imageversion)
 			throws TException {
-		log.info(new Date() + " - returning ImageData: " + sql.getImageData(imageid, imageversion).size()
-				+ "items.");
+		log.info(new Date() + " - returning ImageData: "
+				+ sql.getImageData(imageid, imageversion).size() + "items.");
 		return sql.getImageData(imageid, imageversion);
 	}
 
@@ -242,8 +229,8 @@ public class ServerHandler implements Server.Iface {
 			String image_path, boolean license, boolean internet, long ram,
 			long cpu, String id, String version, boolean isTemplate,
 			long filesize) throws TException {
-		sql.UpdateImageData(name, newName, image_path, license, internet,
-				cpu, ram, id, version, isTemplate, filesize);
+		sql.UpdateImageData(name, newName, image_path, license, internet, cpu,
+				ram, id, version, isTemplate, filesize);
 		return false;
 	}
 
@@ -257,8 +244,8 @@ public class ServerHandler implements Server.Iface {
 	@Override
 	public List<Lecture> getLectureList() throws TException {
 
-		log.info(new Date() + " - returning LectureList: " + getLectureList().size()
-				+ " items.");
+		log.info(new Date() + " - returning LectureList: "
+				+ getLectureList().size() + " items.");
 		return sql.getLectureList();
 	}
 
@@ -272,12 +259,12 @@ public class ServerHandler implements Server.Iface {
 		int imageversion = 0;
 		Map<String, String> image = sql.getImageIDandVersion(imagename);
 
-		pk_image=image.get("GUID");
-		imageversion=Integer.parseInt(image.get("version"));
-		sql.updateLectureData(pk_image, imageversion, lastname, newName,
-				desc, shortdesc, startDate, endDate, isActive, id);
-		
-		XMLCreator xml = new XMLCreator(sql.getConnection(),newName);
+		pk_image = image.get("GUID");
+		imageversion = Integer.parseInt(image.get("version"));
+		sql.updateLectureData(pk_image, imageversion, lastname, newName, desc,
+				shortdesc, startDate, endDate, isActive, id);
+
+		XMLCreator xml = new XMLCreator(sql.getConnection(), newName);
 		try {
 			xml.create(newName);
 		} catch (SQLException | ParserConfigurationException
@@ -302,7 +289,7 @@ public class ServerHandler implements Server.Iface {
 				+ stringFile);
 
 		try {
-			// File wird von Server gelöscht
+			// File wird von Server gel�scht
 			FileUtils.forceDelete(tmpFile);
 			return true;
 
@@ -332,10 +319,12 @@ public class ServerHandler implements Server.Iface {
 		Map<String, String> map = new HashMap<String, String>();
 		map = sql.getDeleteXMLData(id);
 		try {
-			
-			String path = Configuration.config.getAbsolute_path() + "temp/"
-					+ map.get("date").substring(0, map.get("date").length() - 2) + "_" + hs + "_"
-					+ user + "_" + map.get("name") + ".xml";
+
+			String path = Configuration.config.getAbsolute_path()
+					+ "temp/"
+					+ map.get("date")
+							.substring(0, map.get("date").length() - 2) + "_"
+					+ hs + "_" + user + "_" + map.get("name") + ".xml";
 			File xmlFile = new File(path);
 			FileUtils.forceDelete(xmlFile);
 		} catch (IOException e) {
diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java
index 949b3538..824242d4 100644
--- a/Dozentenmodulserver/src/server/startServer.java
+++ b/Dozentenmodulserver/src/server/startServer.java
@@ -44,7 +44,7 @@ public class startServer {
 		}
 		//Start Server
 		BasicConfigurator.configure();
-		log.info( new Date() + " - starting Application\n" );
+		log.info("***** "+ new Date() + " - starting Application *****" );
 		Thread t;
 		t = new Thread(new BinaryListener());
 		servers.add(t);