• Image update now removes old file and avoids zombies

2 files changed, 1152 insertions, 364 deletions

diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index 820169d7..11f7d3ab 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -32,31 +32,25 @@ import thrift.MasterThriftConnection;
 import thrift.SessionData;
 
 import sql.SQL;
+
 //import util.XMLCreator;
 
-public class ServerHandler implements Server.Iface 
-{
-	
+public class ServerHandler implements Server.Iface {
+
 	private static Logger log = Logger.getLogger(ServerHandler.class);
 	static SQL sql = new SQL();
 	Client client = null;
 
-	 
-	public void setTokenForSession(String token)
-	{
+	public void setTokenForSession(String token) {
 		SessionData.session.setAuthToken(token);
 	}
-	
-	
-	
-	public boolean authenticated() throws InvalidTokenException
-	{
+
+	public boolean authenticated() throws InvalidTokenException {
 		MasterThriftConnection thrift = new MasterThriftConnection();
 		client = thrift.getMasterThriftConnection();
 		try {
-			if(client.getUserFromToken(SessionData.session.getAuthToken()) != null)
-			{
-				return true; 
+			if (client.getUserFromToken(SessionData.session.getAuthToken()) != null) {
+				return true;
 			}
 		} catch (TException e) {
 			// TODO Auto-generated catch block
@@ -66,14 +60,9 @@ public class ServerHandler implements Server.Iface
 		return false;
 	}
 
-
-	
-
 	@Override
-	public User getFtpUser() throws TException 
-	{
-		if(authenticated())
-		{
+	public User getFtpUser() throws TException {
+		if (authenticated()) {
 			log.info("returning FTPUser...");
 			User user = new User();
 			user.setUserName(UUID.randomUUID().toString().substring(0, 8));
@@ -84,7 +73,7 @@ public class ServerHandler implements Server.Iface
 			} else {
 				user.setPath(Configuration.config.getAbsolute_path() + "/");
 			}
-	
+
 			// check if folder temp and folder prod exist
 			if (folderTempExists() == true && folderProdExists() == true) {
 				sql.writeFTPUser(user.getUserName(), user.getPassword());
@@ -95,12 +84,10 @@ public class ServerHandler implements Server.Iface
 			}
 		}
 		return null;
-		
+
 	}
 
-	
-	public boolean folderTempExists() 
-	{
+	public boolean folderTempExists() {
 		// check if folder temp exists, otherwise create it
 		Path path = null;
 		if (Configuration.config.getAbsolute_path().endsWith("/")) {
@@ -110,15 +97,14 @@ public class ServerHandler implements Server.Iface
 		}
 
 		if (Files.exists(path) == true) {
-			log.info("folder '" + path	+ "' exists, no further action");
+			log.info("folder '" + path + "' exists, no further action");
 			return true;
 		} else {
 			// create directory and set permissions
 			boolean success = (new File(path + "")).mkdirs();
 
 			if (!success) {
-				log.info("failed to create folder '" + path
-						+ "'");
+				log.info("failed to create folder '" + path + "'");
 				return false;
 			} else {
 				// set permissions
@@ -127,13 +113,12 @@ public class ServerHandler implements Server.Iface
 				} catch (IOException e) {
 					e.printStackTrace();
 				}
-				log.info("folder '" + path	+ "' successfully created");
+				log.info("folder '" + path + "' successfully created");
 				return true;
 			}
 		}
 
 	}// end folderTempExists()
-	
 
 	public boolean folderProdExists() {
 		// check if folder temp exists, otherwise create it
@@ -145,15 +130,14 @@ public class ServerHandler implements Server.Iface
 		}
 
 		if (Files.exists(path) == true) {
-			log.info("folder '" + path	+ "' exists, no further action");
+			log.info("folder '" + path + "' exists, no further action");
 			return true;
 		} else {
 			// create directory and set permissions
 			boolean success = (new File(path + "")).mkdirs();
 
 			if (!success) {
-				log.info("failed to create folder '" + path
-						+ "'");
+				log.info("failed to create folder '" + path + "'");
 				return false;
 			} else {
 				// set permissions
@@ -162,15 +146,13 @@ public class ServerHandler implements Server.Iface
 				} catch (IOException e) {
 					e.printStackTrace();
 				}
-				log.info("folder '" + path
-						+ "' successfully created");
+				log.info("folder '" + path + "' successfully created");
 				return true;
 			}
 		}
 
 	}// end folderProdExists()
 
-	
 	public String getEncodedSha1Sum(String key) {
 		try {
 			MessageDigest md = MessageDigest.getInstance("SHA1");
@@ -184,33 +166,29 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public long DeleteFtpUser(String user) throws TException 
-	{
-		if(authenticated())
-		{
+	public long DeleteFtpUser(String user) throws TException {
+		if (authenticated()) {
 			return sql.DeleteUser(user);
 		}
 		return -1;
 	}
 
 	@Override
-	public String getPathOfImage(String image_id, String version) throws TException 
-	{
-		if(authenticated())
-		{
-			log.info("successfully returned PathOfImage: " + sql.getPathOfImage(image_id, version));
+	public String getPathOfImage(String image_id, String version)
+			throws TException {
+		if (authenticated()) {
+			log.info("successfully returned PathOfImage: "
+					+ sql.getPathOfImage(image_id, version));
 			return sql.getPathOfImage(image_id, version);
 		}
 		return null;
 	}
 
-	
 	@Override
-	public String setInstitution(String university) throws InvalidTokenException 
-	{
-		if(authenticated())
-		{
-		return sql.setInstitution(university);
+	public String setInstitution(String university)
+			throws InvalidTokenException {
+		if (authenticated()) {
+			return sql.setInstitution(university);
 		}
 		return null;
 	}
@@ -220,176 +198,158 @@ public class ServerHandler implements Server.Iface
 			String firstname, String lastname, String university, String Mail,
 			String Tel, String Fak, boolean license, boolean internet,
 			long ram, long cpu, String imagePath, boolean isTemplate,
-			long filesize, long shareMode, String os, String uid) throws TException 
-	{
-		
-		if(authenticated())
-		{
+			long filesize, long shareMode, String os, String uid)
+			throws TException {
+
+		if (authenticated()) {
 			String mode = null;
-	
+
 			if (shareMode == 0) {
 				mode = "only_local";
 			} else {
 				mode = "to_be_published";
 			}
-	
+
 			// String pk_institution = sql.setInstitution(university);
-			// String pk_person = sql.setPerson(login, lastname, firstname, Mail,
+			// String pk_person = sql.setPerson(login, lastname, firstname,
+			// Mail,
 			// new Date(), pk_institution);
-	
+
 			// OS impl Select and write
-			// ACHTUNG: Anzahl der Leerzeichen muss eingehalten werden: 'Windows 7
+			// ACHTUNG: Anzahl der Leerzeichen muss eingehalten werden: 'Windows
+			// 7
 			// 32 bit"
-			String pk_os = sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)), os
-					.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" "))
-					.replace(" ", ""));
-	
+			String pk_os = sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),
+					os.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" "))
+							.replace(" ", ""));
+
 			// sql.setImageData(pk_person, license, internet, cpu, ram,
 			// imagename,desc, imagePath, filesize,mode,pk_os);
-	
-			sql.setImageData(login, license, internet, cpu, ram, imagename, desc,
-					imagePath, filesize, mode, pk_os, uid);
-	
+
+			sql.setImageData(login, license, internet, cpu, ram, imagename,
+					desc, imagePath, filesize, mode, pk_os, uid);
+
 			log.info("written VLdata");
 			return true;
 		}
 		return false;
 	}
 
-	
 	@Override
-	public List<Image> getImageListPermissionWrite(String userID) throws TException 
-	{
-		if(authenticated())
-		{
+	public List<Image> getImageListPermissionWrite(String userID)
+			throws TException {
+		if (authenticated()) {
 			return sql.getImageListPermissionWrite(userID);
 		}
 		return null;
 	}
 
-	
 	@Override
-	public List<Image> getImageListPermissionRead(String userID) throws TException 
-	{
-		if(authenticated())
-		{
+	public List<Image> getImageListPermissionRead(String userID)
+			throws TException {
+		if (authenticated()) {
 			return sql.getImageListPermissionRead(userID);
 		}
 		return null;
 	}
 
-	
 	@Override
-	public List<Image> getImageListPermissionLink(String userID) throws TException 
-	{
-		if(authenticated())
-		{
+	public List<Image> getImageListPermissionLink(String userID)
+			throws TException {
+		if (authenticated()) {
 			return sql.getImageListPermissionLink(userID);
 		}
 		return null;
 	}
-	
-	
+
 	@Override
-	public List<Image> getImageListPermissionAdmin(String userID) throws TException 
-	{
-		if(authenticated())
-		{
+	public List<Image> getImageListPermissionAdmin(String userID)
+			throws TException {
+		if (authenticated()) {
 			return sql.getImageListPermissionAdmin(userID);
 		}
 		return null;
 	}
-	
+
 	@Override
-	public List<Image> getImageListAllTemplates() throws TException 
-	{
-		if(authenticated())
-		{
+	public List<Image> getImageListAllTemplates() throws TException {
+		if (authenticated()) {
 			return sql.getImageListAllTemplates();
 		}
 		return null;
 	}
-	
 
 	@Override
-	public List<String> getAllOS() throws TException 
-	{
-		if(authenticated())
-		{
+	public List<String> getAllOS() throws TException {
+		if (authenticated()) {
 			return sql.getAllOS();
 		}
 		return null;
 	}
 
 	@Override
-	public Map<String, String> getPersonData(String Vorname, String Nachname) throws TException 
-	{
-		if(authenticated())
-		{
+	public Map<String, String> getPersonData(String Vorname, String Nachname)
+			throws TException {
+		if (authenticated()) {
 			return sql.getPersonData(Vorname, Nachname);
 		}
 		return null;
 	}
 
-	public void setPerson(String login, String lastname, String firstname,String mail, String Institution) throws InvalidTokenException 
-	{
-		if(authenticated())
-		{
-			sql.setPerson(login, lastname, firstname, mail, new Date(), Institution);
+	public void setPerson(String login, String lastname, String firstname,
+			String mail, String Institution) throws InvalidTokenException {
+		if (authenticated()) {
+			sql.setPerson(login, lastname, firstname, mail, new Date(),
+					Institution);
 		}
 	}
 
 	@Override
 	public boolean writeLecturedata(String name, String shortdesc, String desc,
-			String startDate, String endDate, boolean isActive,
-			String imageID, String login, String firstname, String lastname,
-			String university, String Mail, String Tel, String Fak, String lectureID)
-			throws TException 
-	{
-		if(authenticated())
-		{
-		
-			//String pk_image = imageID;
+			String startDate, String endDate, boolean isActive, String imageID,
+			String login, String firstname, String lastname, String university,
+			String Mail, String Tel, String Fak, String lectureID)
+			throws TException {
+		if (authenticated()) {
+
+			// String pk_image = imageID;
 			Map<String, String> map = new HashMap<String, String>();
 			int imageversion = 0;
 			String pk_institution = sql.setInstitution(university);
 			String pk_person = sql.setPerson(login, lastname, firstname, Mail,
 					new Date(), pk_institution);
-	
+
 			map = sql.getImageIDandVersion(imageID);
-	
-			//pk_image = map.get("GUID");
+
+			// pk_image = map.get("GUID");
 			imageversion = Integer.parseInt(map.get("version"));
-			
+
 			sql.setLectureData(pk_person, imageID, imageversion, name, desc,
 					shortdesc, startDate, endDate, isActive, lectureID);
 		}
-			return false;
-		
+		return false;
+
 	}
-	
 
 	@Override
-	public boolean startFileCopy(String filename) throws TException 
-	{
-		if(authenticated())
-		{
+	public boolean startFileCopy(String filename) throws TException {
+		if (authenticated()) {
 			// copy file from folder temp to folder prod
 			String file = Configuration.config.getAbsolute_path() + "temp/"
 					+ filename;
 			File tmpFile = new File(file);
-	
+
 			log.info("Trying to move file to '/srv/openslx/nfs/prod/"
 					+ tmpFile.getName() + "'");
 			try {
 				FileUtils.moveFile(tmpFile,
-						new File(Configuration.config.getAbsolute_path() + "prod/"
-								+ filename));
+						new File(Configuration.config.getAbsolute_path()
+								+ "prod/" + filename));
 				// int ret = sql.UpdateImagePath(filename);
 				if (sql.UpdateImagePath(filename) == 0) {
 					log.info("file moved and database updated.");
 				}
-	
+
 			} catch (IOException e) {
 				log.info("Failed to move file.");
 				e.printStackTrace();
@@ -399,11 +359,11 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public Map<String, String> getImageData(String imageid, String imageversion) throws TException 
-	{
-		if(authenticated())
-		{
-			//log.info("returning ImageData: "+ sql.getImageData(imageid, imageversion).size() + "items.");
+	public Map<String, String> getImageData(String imageid, String imageversion)
+			throws TException {
+		if (authenticated()) {
+			// log.info("returning ImageData: "+ sql.getImageData(imageid,
+			// imageversion).size() + "items.");
 			return sql.getImageData(imageid, imageversion);
 		}
 		return null;
@@ -413,90 +373,97 @@ public class ServerHandler implements Server.Iface
 	public boolean updateImageData(String name, String newName, String desc,
 			String image_path, boolean license, boolean internet, long ram,
 			long cpu, String id, String version, boolean isTemplate,
-			long filesize, long shareMode, String os) throws TException 
-	{
-		if(authenticated())
-		{
+			long filesize, long shareMode, String os) throws TException {
+
+		if (authenticated()) {
+			
+			//get old_image_path
+			String old_image_path = sql.getFile(id, version);
 			String mode = null;
-	
+
 			if (shareMode == 0) {
 				mode = "only_local";
 			} else {
 				mode = "to_be_published";
 			}
-			String pk_os = sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)), os
-					.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" "))
-					.replace(" ", ""));
-			sql.UpdateImageData(name, newName, desc, image_path, license, internet,
-					cpu, ram, id, version, isTemplate, filesize, mode, pk_os);
+			String pk_os = sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),
+					os.substring(nthIndexOf(os, " ", 2), os.lastIndexOf(" "))
+							.replace(" ", ""));
+
+			// do database update - if successful then delete old file from
+			// drive
+			int val = sql.UpdateImageData(name, newName, desc, image_path,
+					license, internet, cpu, ram, id, version, isTemplate,
+					filesize, mode, pk_os);
+
+			if (val == 0) {
+				// update was successful - delete old file
+				deleteImageByPath(old_image_path);
+			} else {
+				// update was not successful - delete new file
+				// TODO not yet implemented
+
+			}
 		}
 		return false;
 	}
 
 	@Override
-	public List<Lecture> getLectureList() throws TException 
-	{
-		if(authenticated())
-		{
-			//log.info("returning LectureList");
+	public List<Lecture> getLectureList() throws TException {
+		if (authenticated()) {
+			// log.info("returning LectureList");
 			return sql.getLectureList();
 		}
 		return null;
 	}
 
 	@Override
-	public List<Lecture> getLectureListPermissionRead(String userID) throws InvalidTokenException 
-	{
-		if(authenticated())
-		{
-			//log.info("returning LectureListRead");
+	public List<Lecture> getLectureListPermissionRead(String userID)
+			throws InvalidTokenException {
+		if (authenticated()) {
+			// log.info("returning LectureListRead");
 			return sql.getLectureListPermissionRead(userID);
 		}
 		return null;
 	}// end getLectureListPermissionRead
 
-	
 	@Override
-	public List<Lecture> getLectureListPermissionWrite(String userID) throws InvalidTokenException 
-	{
-		if(authenticated())
-		{
-			//log.info("returning LectureListWrite");
+	public List<Lecture> getLectureListPermissionWrite(String userID)
+			throws InvalidTokenException {
+		if (authenticated()) {
+			// log.info("returning LectureListWrite");
 			return sql.getLectureListPermissionWrite(userID);
 		}
 		return null;
 	}// end getLectureListPermissionRead
 
 	@Override
-	public List<Lecture> getLectureListPermissionAdmin(String userID) throws InvalidTokenException 
-	{
-		if(authenticated())
-		{
-			//log.info("returning LectureListAdmin");
+	public List<Lecture> getLectureListPermissionAdmin(String userID)
+			throws InvalidTokenException {
+		if (authenticated()) {
+			// log.info("returning LectureListAdmin");
 			return sql.getLectureListPermissionAdmin(userID);
 		}
 		return null;
 	}// end getLectureListPermissionRead
 
-	
 	@Override
 	public boolean updateLecturedata(String name, String newName,
 			String shortdesc, String desc, String startDate, String endDate,
 			boolean isActive, String imageid, String imageversion, String user,
 			String firstname, String lastname, String university, String Mail,
-			String Tel, String Fak, String id) throws TException 
-	{
-		if(authenticated())
-		{
+			String Tel, String Fak, String id) throws TException {
+		if (authenticated()) {
 			Map<String, String> map = new HashMap<String, String>();
 			map = sql.getDeleteXMLData(id);
-			sql.updateLectureData(imageid, imageversion, lastname, newName, desc,
-					shortdesc, startDate, endDate, isActive, id);
-	
-			String path = Configuration.config.getAbsolute_path() + "prod/"
-					+ map.get("date").substring(0, map.get("date").length() - 2)
-					+ "_" + university + "_" + user + "_" + map.get("name")
-					+ ".xml";
+			sql.updateLectureData(imageid, imageversion, lastname, newName,
+					desc, shortdesc, startDate, endDate, isActive, id);
+
+			String path = Configuration.config.getAbsolute_path()
+					+ "prod/"
+					+ map.get("date")
+							.substring(0, map.get("date").length() - 2) + "_"
+					+ university + "_" + user + "_" + map.get("name") + ".xml";
 			File tmpFile = new File(path);
 			try {
 				FileUtils.forceDelete(tmpFile);
@@ -507,119 +474,133 @@ public class ServerHandler implements Server.Iface
 		return false;
 	}
 
-	
 	@Override
-	public boolean deleteImageServer(String imageid, String imageversion) throws TException 
-	{
-		if(authenticated())
-		{
+	public boolean deleteImageServer(String imageid, String imageversion)
+			throws TException {
+		if (authenticated()) {
 			String stringFile = sql.getFile(imageid, imageversion);
 			log.info("File to Delete: " + stringFile);
-	
+
 			File tmpFile = new File(Configuration.config.getAbsolute_path()
 					+ stringFile);
-	
+
 			try {
 				// File wird von Server gelöscht
 				FileUtils.forceDelete(tmpFile);
 				return true;
-	
+
 			} catch (IOException e) {
 				log.info("Failed to execute deleteImageServer.");
 				e.printStackTrace();
-	
+
 			}
 		}
 		return false;
 	}
-
 	
 	@Override
-	public boolean deleteImageData(String id, String version) throws TException 
-	{
-		boolean success=false;
+	public boolean deleteImageByPath(String image_path){
+		
+		try {
+			if (authenticated()) {
+				//String stringFile = sql.getFile(imageid, imageversion);
+				log.info("File to Delete: " + image_path);
+
+				File tmpFile = new File(Configuration.config.getAbsolute_path()
+						+ image_path);
+
+				try {
+					// File wird von Server gelöscht
+					FileUtils.forceDelete(tmpFile);
+					return true;
+
+				} catch (IOException e) {
+					log.info("Failed to execute deleteImageServer.");
+					e.printStackTrace();
+
+				}
+			}
+		} catch (InvalidTokenException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return false;
 		
-		if(authenticated())
-		{
-			if(sql.deleteImage(id, version)==true)
-			{
-				success=true;
-				log.info("Image '"+id+"' and permissions successfully deleted.");
+	}
+	
+
+	@Override
+	public boolean deleteImageData(String id, String version) throws TException {
+		boolean success = false;
+
+		if (authenticated()) {
+			if (sql.deleteImage(id, version) == true) {
+				success = true;
+				log.info("Image '" + id
+						+ "' and permissions successfully deleted.");
 			}
 		}
 		return success;
 	}
 
 	@Override
-	public boolean connectedToLecture(String id, String version) throws TException 
-	{
-		if(authenticated())
-		{
+	public boolean connectedToLecture(String id, String version)
+			throws TException {
+		if (authenticated()) {
 			return sql.connectedToLecture(id, version);
 		}
 		return true;
 	}
 
-	public boolean deleteLecture(String id, String hs, String user) throws InvalidTokenException 
-	{
+	public boolean deleteLecture(String id, String hs, String user)
+			throws InvalidTokenException {
 		boolean success = false;
-		
-		
-		if(authenticated())
-		{
+
+		if (authenticated()) {
 			/*
-			Map<String, String> map = new HashMap<String, String>();
-			map = sql.getDeleteXMLData(id);
-			try {
-	
-				String path = Configuration.config.getAbsolute_path()
-						+ "prod/"
-						+ 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) {
-				log.info("Failed to execute deleteLecture.");
-				e.printStackTrace();
-			}
-			*/
-			if(sql.deleteLecture(id) == true){
+			 * Map<String, String> map = new HashMap<String, String>(); map =
+			 * sql.getDeleteXMLData(id); try {
+			 * 
+			 * String path = Configuration.config.getAbsolute_path() + "prod/" +
+			 * 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) { log.info("Failed to execute deleteLecture.");
+			 * e.printStackTrace(); }
+			 */
+			if (sql.deleteLecture(id) == true) {
 				success = true;
-				log.info("Lecture '"+id+"' and permissions successfully deleted.");
+				log.info("Lecture '" + id
+						+ "' and permissions successfully deleted.");
 			}
 		}
 		return success;
-		
+
 	}
 
 	@Override
-	public List<String> getAllUniversities() throws TException 
-	{
-		if(authenticated())
-		{
+	public List<String> getAllUniversities() throws TException {
+		if (authenticated()) {
 			return sql.getAllUniversities();
 		}
 		return null;
 	}
 
 	@Override
-	public Map<String, String> getLectureData(String lectureid) throws TException 
-	{
-		if(authenticated())
-		{
-			//log.info("returning LectureData");
+	public Map<String, String> getLectureData(String lectureid)
+			throws TException {
+		if (authenticated()) {
+			// log.info("returning LectureData");
 			return sql.getLectureData(lectureid);
 		}
 		return null;
 	}
 
-	public static int nthIndexOf(final String string, final String token,final int index) 
-	{
+	public static int nthIndexOf(final String string, final String token,
+			final int index) {
 		int j = 0;
 
-		for (int i = 0; i < index; i++) 
-		{
+		for (int i = 0; i < index; i++) {
 			j = string.indexOf(token, j + 1);
 			if (j == -1)
 				break;
@@ -629,10 +610,8 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public boolean checkUser(String username) throws TException 
-	{
-		if(authenticated())
-		{
+	public boolean checkUser(String username) throws TException {
+		if (authenticated()) {
 			return sql.checkUser(username);
 		}
 		return false;
@@ -640,12 +619,12 @@ public class ServerHandler implements Server.Iface
 	}
 
 	@Override
-	public boolean createUser(String loginName, String lastName,String firstName, String mail, String university) throws TException 
-	{
-		if(authenticated())
-		{
+	public boolean createUser(String loginName, String lastName,
+			String firstName, String mail, String university) throws TException {
+		if (authenticated()) {
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(loginName, lastName, firstName, mail, new Date(), pk_institution);
+			String pk_person = sql.setPerson(loginName, lastName, firstName,
+					mail, new Date(), pk_institution);
 			return true;
 		}
 		return false;
@@ -654,23 +633,20 @@ public class ServerHandler implements Server.Iface
 	@Override
 	public boolean writeImageRights(String imageID, String username,
 			String lastName, String firstName, String mail, String university,
-			String role) throws TException 
-	{
-		if(authenticated())
-		{
+			String role) throws TException {
+		if (authenticated()) {
 			String pk_image = null;
 			Map<String, String> map = new HashMap<String, String>();
 			int imageversion = 0;
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(username, lastName, firstName, mail,
-					new Date(), pk_institution);
-	
+			String pk_person = sql.setPerson(username, lastName, firstName,
+					mail, new Date(), pk_institution);
+
 			map = sql.getImageIDandVersion(imageID);
-	
-	
+
 			pk_image = map.get("GUID");
 			imageversion = Integer.parseInt(map.get("version"));
-	
+
 			if (role.equals("Dozent")) {
 				int read = 1;
 				int write = 1;
@@ -678,10 +654,10 @@ public class ServerHandler implements Server.Iface
 				int admin = 1;
 				int linkallowed = 1;
 				int roleID = sql.getRoleID(role);
-	
-				sql.setImageRights(pk_person, pk_image, roleID, read, write, admin,
-						linkallowed);
-	
+
+				sql.setImageRights(pk_person, pk_image, roleID, read, write,
+						admin, linkallowed);
+
 			} else if (role.equals("Admin")) {
 				int read = 1;
 				int write = 1;
@@ -689,9 +665,9 @@ public class ServerHandler implements Server.Iface
 				int admin = 1;
 				int linkallowed = 1;
 				int roleID = sql.getRoleID(role);
-	
-				sql.setImageRights(pk_person, pk_image, roleID, read, write, admin,
-						linkallowed);
+
+				sql.setImageRights(pk_person, pk_image, roleID, read, write,
+						admin, linkallowed);
 			} else {
 				int read = 1;
 				int write = 0;
@@ -699,11 +675,11 @@ public class ServerHandler implements Server.Iface
 				int admin = 0;
 				int linkallowed = 0;
 				int roleID = sql.getRoleID(role);
-	
-				sql.setImageRights(pk_person, pk_image, roleID, read, write, admin,
-						linkallowed);
+
+				sql.setImageRights(pk_person, pk_image, roleID, read, write,
+						admin, linkallowed);
 			}
-	
+
 			log.info("Written image rights");
 			return true;
 		}
@@ -713,34 +689,32 @@ public class ServerHandler implements Server.Iface
 	@Override
 	public boolean writeLectureRights(String lectureID, String username,
 			String lastName, String firstName, String mail, String university,
-			String role) throws TException 
-	{
-		if(authenticated())
-		{
-			//String pk_lecture = null;
-	
+			String role) throws TException {
+		if (authenticated()) {
+			// String pk_lecture = null;
+
 			String pk_institution = sql.setInstitution(university);
-			String pk_person = sql.setPerson(username, lastName, firstName, mail,
-					new Date(), pk_institution);
-			//pk_lecture = sql.getLectureID(lectureID);
-	
+			String pk_person = sql.setPerson(username, lastName, firstName,
+					mail, new Date(), pk_institution);
+			// pk_lecture = sql.getLectureID(lectureID);
+
 			if (role.equals("Dozent")) {
 				int read = 1;
 				int write = 1;
 				// int changePermission=0;
 				int admin = 1;
 				int roleID = sql.getRoleID(role);
-	
+
 				sql.setLectureRights(pk_person, lectureID, roleID, read, write,
 						admin);
-	
+
 			} else if (role.equals("Admin")) {
 				int read = 1;
 				int write = 1;
 				// int changePermission=1;
 				int admin = 1;
 				int roleID = sql.getRoleID(role);
-	
+
 				sql.setLectureRights(pk_person, lectureID, roleID, read, write,
 						admin);
 			} else {
@@ -749,60 +723,55 @@ public class ServerHandler implements Server.Iface
 				// int changePermission=0;
 				int admin = 0;
 				int roleID = sql.getRoleID(role);
-	
+
 				sql.setLectureRights(pk_person, lectureID, roleID, read, write,
 						admin);
 			}
-	
+
 			return true;
 		}
 		return false;
 	}
 
 	@Override
-	public List<Person> getAllOtherSatelliteUsers(List<String> userID) throws TException 
-	{
-		if(authenticated())
-		{
+	public List<Person> getAllOtherSatelliteUsers(List<String> userID)
+			throws TException {
+		if (authenticated()) {
 			return sql.getAllOtherSatelliteUsers(userID);
 			// return null;
 		}
 		return null;
 	}
 
-	//set permissions for users which are !=userID
+	// set permissions for users which are !=userID
 	public boolean writeAdditionalImageRights(String imageID, String userID,
 			boolean isRead, boolean isWrite, boolean isLinkAllowed,
-			boolean isAdmin) throws InvalidTokenException 
-	{
+			boolean isAdmin) throws InvalidTokenException {
 		boolean success = false;
-		if(authenticated())
-		{
+		if (authenticated()) {
 
 			Map<String, String> map = new HashMap<String, String>();
 			map = sql.getImageIDandVersion(imageID);
-			//String imageID = map.get("GUID");
-	
+			// String imageID = map.get("GUID");
+
 			sql.writeAdditionalImageRights(imageID, userID, isRead, isWrite,
 					isLinkAllowed, isAdmin);
-			log.info("Written additional image rights for "	+ userID);
+			log.info("Written additional image rights for " + userID);
 		}
 		return success;
 	}
 
-	
 	public boolean writeAdditionalLectureRights(String lectureID,
-			String userID, boolean isRead, boolean isWrite, boolean isAdmin) throws InvalidTokenException 
-	{
-		if(authenticated())
-		{
+			String userID, boolean isRead, boolean isWrite, boolean isAdmin)
+			throws InvalidTokenException {
+		if (authenticated()) {
 			Map<String, String> map = new HashMap<String, String>();
-			//String lectureID = sql.getLectureID(lectureID);
-	
-			sql.writeAdditionalLectureRights(lectureID, userID, isRead, isWrite,
-					isAdmin);
-			log.info("Written additional lecture rights for "+ userID);
-	
+			// String lectureID = sql.getLectureID(lectureID);
+
+			sql.writeAdditionalLectureRights(lectureID, userID, isRead,
+					isWrite, isAdmin);
+			log.info("Written additional lecture rights for " + userID);
+
 			return true;
 		}
 		return false;
@@ -810,122 +779,99 @@ public class ServerHandler implements Server.Iface
 
 	@Override
 	public List<Person> getPermissionForUserAndImage(String userID,
-			String imageID) throws TException 
-	{
-		if(authenticated())
-		{
+			String imageID) throws TException {
+		if (authenticated()) {
 			return sql.getPermissionForUserAndImage(userID, imageID);
 		}
 		return null;
 	}
 
-	public List<Person> getPermissionForUserAndLecture(String userID,String lectureID) throws InvalidTokenException 
-	{
-		if(authenticated())
-		{
+	public List<Person> getPermissionForUserAndLecture(String userID,
+			String lectureID) throws InvalidTokenException {
+		if (authenticated()) {
 			return sql.getPermissionForUserAndLecture(userID, lectureID);
 		}
 		return null;
 	}
 
 	@Override
-	public void deleteAllAdditionalImagePermissions(String imageID,String userID) throws TException 
-	{
-		if(authenticated())
-		{
+	public void deleteAllAdditionalImagePermissions(String imageID,
+			String userID) throws TException {
+		if (authenticated()) {
 			sql.deleteAllAdditionalImagePermissions(imageID, userID);
 		}
 		return;
 	}
 
 	@Override
-	public void deleteAllAdditionalLecturePermissions(String lectureID,String userID) throws TException 
-	{
-		if(authenticated())
-		{
+	public void deleteAllAdditionalLecturePermissions(String lectureID,
+			String userID) throws TException {
+		if (authenticated()) {
 			sql.deleteAllAdditionalLecturePermissions(lectureID, userID);
 		}
-		
+
 		return;
 	}
 
-	@Override 
-	public List<Image> getImageList(String userID) throws TException 
-	{
-		if(authenticated())
-		{
+	@Override
+	public List<Image> getImageList(String userID) throws TException {
+		if (authenticated()) {
 			return sql.getImageList(userID);
 		}
 		return null;
 	}
 
 	@Override
-	public List<String> getAdditionalImageContacts(String imageID) throws TException 
-	{
-		if(authenticated())
-		{
+	public List<String> getAdditionalImageContacts(String imageID)
+			throws TException {
+		if (authenticated()) {
 			return sql.getAdditionalImageContacts(imageID);
 		}
 		return null;
 	}
 
 	@Override
-	public String getOsNameForGuestOs(String guestOS) throws TException 
-	{
-		if(authenticated())
-		{
+	public String getOsNameForGuestOs(String guestOS) throws TException {
+		if (authenticated()) {
 			return sql.getOsNameForGuestOs(guestOS);
 		}
 		return null;
 	}
 
 	@Override
-
-	public String createRandomUUID() throws TException 
-	{
-		if(authenticated())
-		{
+	public String createRandomUUID() throws TException {
+		if (authenticated()) {
 			return sql.createRandomUUID();
 		}
 		return null;
 	}
 
-	public Map<String, String> getItemOwner(String itemID) throws TException 
-	{
-		if(authenticated())
-		{
+	public Map<String, String> getItemOwner(String itemID) throws TException {
+		if (authenticated()) {
 			return sql.getItemOwner(itemID);
 		}
 		return null;
 
 	}
 
-
-
 	@Override
 	public boolean userIsImageAdmin(String userID, String imageID)
 			throws TException {
-		
-		if(authenticated())
-		{
-			return sql.userIsImageAdmin(userID,imageID);
+
+		if (authenticated()) {
+			return sql.userIsImageAdmin(userID, imageID);
 		}
 		return false;
-		
-	}
-
 
+	}
 
 	@Override
 	public boolean userIsLectureAdmin(String userID, String lectureID)
 			throws TException {
-		if(authenticated())
-		{
-			return sql.userIsLectureAdmin(userID,lectureID);
+		if (authenticated()) {
+			return sql.userIsLectureAdmin(userID, lectureID);
 		}
 		return false;
 	}
 
-
-
 }// end class
diff --git a/dozentenmodulserver/src/main/java/server/generated/Server.java b/dozentenmodulserver/src/main/java/server/generated/Server.java
index 0b6092ad..b0c2d57f 100644
--- a/dozentenmodulserver/src/main/java/server/generated/Server.java
+++ b/dozentenmodulserver/src/main/java/server/generated/Server.java
@@ -94,6 +94,8 @@ public class Server {
 
     public boolean deleteImageServer(String id, String version) throws org.apache.thrift.TException;
 
+    public boolean deleteImageByPath(String image_path) throws org.apache.thrift.TException;
+
     public boolean connectedToLecture(String id, String version) throws org.apache.thrift.TException;
 
     public boolean deleteLecture(String id, String hs, String user) throws org.apache.thrift.TException;
@@ -192,6 +194,8 @@ public class Server {
 
     public void deleteImageServer(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
+    public void deleteImageByPath(String image_path, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
     public void connectedToLecture(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void deleteLecture(String id, String hs, String user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -976,6 +980,29 @@ public class Server {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteImageServer failed: unknown result");
     }
 
+    public boolean deleteImageByPath(String image_path) throws org.apache.thrift.TException
+    {
+      send_deleteImageByPath(image_path);
+      return recv_deleteImageByPath();
+    }
+
+    public void send_deleteImageByPath(String image_path) throws org.apache.thrift.TException
+    {
+      deleteImageByPath_args args = new deleteImageByPath_args();
+      args.setImage_path(image_path);
+      sendBase("deleteImageByPath", args);
+    }
+
+    public boolean recv_deleteImageByPath() throws org.apache.thrift.TException
+    {
+      deleteImageByPath_result result = new deleteImageByPath_result();
+      receiveBase(result, "deleteImageByPath");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteImageByPath failed: unknown result");
+    }
+
     public boolean connectedToLecture(String id, String version) throws org.apache.thrift.TException
     {
       send_connectedToLecture(id, version);
@@ -2558,6 +2585,38 @@ public class Server {
       }
     }
 
+    public void deleteImageByPath(String image_path, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      deleteImageByPath_call method_call = new deleteImageByPath_call(image_path, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class deleteImageByPath_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String image_path;
+      public deleteImageByPath_call(String image_path, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.image_path = image_path;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteImageByPath", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        deleteImageByPath_args args = new deleteImageByPath_args();
+        args.setImage_path(image_path);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_deleteImageByPath();
+      }
+    }
+
     public void connectedToLecture(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       connectedToLecture_call method_call = new connectedToLecture_call(id, version, resultHandler, this, ___protocolFactory, ___transport);
@@ -3275,6 +3334,7 @@ public class Server {
       processMap.put("deleteImageData", new deleteImageData());
       processMap.put("updateLecturedata", new updateLecturedata());
       processMap.put("deleteImageServer", new deleteImageServer());
+      processMap.put("deleteImageByPath", new deleteImageByPath());
       processMap.put("connectedToLecture", new connectedToLecture());
       processMap.put("deleteLecture", new deleteLecture());
       processMap.put("checkUser", new checkUser());
@@ -3884,6 +3944,27 @@ public class Server {
       }
     }
 
+    public static class deleteImageByPath<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteImageByPath_args> {
+      public deleteImageByPath() {
+        super("deleteImageByPath");
+      }
+
+      public deleteImageByPath_args getEmptyArgsInstance() {
+        return new deleteImageByPath_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public deleteImageByPath_result getResult(I iface, deleteImageByPath_args args) throws org.apache.thrift.TException {
+        deleteImageByPath_result result = new deleteImageByPath_result();
+        result.success = iface.deleteImageByPath(args.image_path);
+        result.setSuccessIsSet(true);
+        return result;
+      }
+    }
+
     public static class connectedToLecture<I extends Iface> extends org.apache.thrift.ProcessFunction<I, connectedToLecture_args> {
       public connectedToLecture() {
         super("connectedToLecture");
@@ -4296,6 +4377,7 @@ public class Server {
       processMap.put("deleteImageData", new deleteImageData());
       processMap.put("updateLecturedata", new updateLecturedata());
       processMap.put("deleteImageServer", new deleteImageServer());
+      processMap.put("deleteImageByPath", new deleteImageByPath());
       processMap.put("connectedToLecture", new connectedToLecture());
       processMap.put("deleteLecture", new deleteLecture());
       processMap.put("checkUser", new checkUser());
@@ -5802,6 +5884,58 @@ public class Server {
       }
     }
 
+    public static class deleteImageByPath<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteImageByPath_args, Boolean> {
+      public deleteImageByPath() {
+        super("deleteImageByPath");
+      }
+
+      public deleteImageByPath_args getEmptyArgsInstance() {
+        return new deleteImageByPath_args();
+      }
+
+      public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(Boolean o) {
+            deleteImageByPath_result result = new deleteImageByPath_result();
+            result.success = o;
+            result.setSuccessIsSet(true);
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            deleteImageByPath_result result = new deleteImageByPath_result();
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, deleteImageByPath_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.deleteImageByPath(args.image_path,resultHandler);
+      }
+    }
+
     public static class connectedToLecture<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, connectedToLecture_args, Boolean> {
       public connectedToLecture() {
         super("connectedToLecture");
@@ -34277,6 +34411,714 @@ public class Server {
 
   }
 
+  public static class deleteImageByPath_args implements org.apache.thrift.TBase<deleteImageByPath_args, deleteImageByPath_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageByPath_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteImageByPath_args");
+
+    private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("image_path", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new deleteImageByPath_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new deleteImageByPath_argsTupleSchemeFactory());
+    }
+
+    public String image_path; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      IMAGE_PATH((short)1, "image_path");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // IMAGE_PATH
+            return IMAGE_PATH;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.IMAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("image_path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageByPath_args.class, metaDataMap);
+    }
+
+    public deleteImageByPath_args() {
+    }
+
+    public deleteImageByPath_args(
+      String image_path)
+    {
+      this();
+      this.image_path = image_path;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public deleteImageByPath_args(deleteImageByPath_args other) {
+      if (other.isSetImage_path()) {
+        this.image_path = other.image_path;
+      }
+    }
+
+    public deleteImageByPath_args deepCopy() {
+      return new deleteImageByPath_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.image_path = null;
+    }
+
+    public String getImage_path() {
+      return this.image_path;
+    }
+
+    public deleteImageByPath_args setImage_path(String image_path) {
+      this.image_path = image_path;
+      return this;
+    }
+
+    public void unsetImage_path() {
+      this.image_path = null;
+    }
+
+    /** Returns true if field image_path is set (has been assigned a value) and false otherwise */
+    public boolean isSetImage_path() {
+      return this.image_path != null;
+    }
+
+    public void setImage_pathIsSet(boolean value) {
+      if (!value) {
+        this.image_path = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case IMAGE_PATH:
+        if (value == null) {
+          unsetImage_path();
+        } else {
+          setImage_path((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case IMAGE_PATH:
+        return getImage_path();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case IMAGE_PATH:
+        return isSetImage_path();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof deleteImageByPath_args)
+        return this.equals((deleteImageByPath_args)that);
+      return false;
+    }
+
+    public boolean equals(deleteImageByPath_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_image_path = true && this.isSetImage_path();
+      boolean that_present_image_path = true && that.isSetImage_path();
+      if (this_present_image_path || that_present_image_path) {
+        if (!(this_present_image_path && that_present_image_path))
+          return false;
+        if (!this.image_path.equals(that.image_path))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    @Override
+    public int compareTo(deleteImageByPath_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = Boolean.valueOf(isSetImage_path()).compareTo(other.isSetImage_path());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetImage_path()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.image_path, other.image_path);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("deleteImageByPath_args(");
+      boolean first = true;
+
+      sb.append("image_path:");
+      if (this.image_path == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.image_path);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private static class deleteImageByPath_argsStandardSchemeFactory implements SchemeFactory {
+      public deleteImageByPath_argsStandardScheme getScheme() {
+        return new deleteImageByPath_argsStandardScheme();
+      }
+    }
+
+    private static class deleteImageByPath_argsStandardScheme extends StandardScheme<deleteImageByPath_args> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageByPath_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            case 1: // IMAGE_PATH
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.image_path = iprot.readString();
+                struct.setImage_pathIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
+        }
+        iprot.readStructEnd();
+
+        // check for required fields of primitive type, which can't be checked in the validate method
+        struct.validate();
+      }
+
+      public void write(org.apache.thrift.protocol.TProtocol oprot, deleteImageByPath_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.image_path != null) {
+          oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC);
+          oprot.writeString(struct.image_path);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class deleteImageByPath_argsTupleSchemeFactory implements SchemeFactory {
+      public deleteImageByPath_argsTupleScheme getScheme() {
+        return new deleteImageByPath_argsTupleScheme();
+      }
+    }
+
+    private static class deleteImageByPath_argsTupleScheme extends TupleScheme<deleteImageByPath_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageByPath_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetImage_path()) {
+          optionals.set(0);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetImage_path()) {
+          oprot.writeString(struct.image_path);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageByPath_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.image_path = iprot.readString();
+          struct.setImage_pathIsSet(true);
+        }
+      }
+    }
+
+  }
+
+  public static class deleteImageByPath_result implements org.apache.thrift.TBase<deleteImageByPath_result, deleteImageByPath_result._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageByPath_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteImageByPath_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new deleteImageByPath_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new deleteImageByPath_resultTupleSchemeFactory());
+    }
+
+    public boolean success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __SUCCESS_ISSET_ID = 0;
+    private byte __isset_bitfield = 0;
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageByPath_result.class, metaDataMap);
+    }
+
+    public deleteImageByPath_result() {
+    }
+
+    public deleteImageByPath_result(
+      boolean success)
+    {
+      this();
+      this.success = success;
+      setSuccessIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public deleteImageByPath_result(deleteImageByPath_result other) {
+      __isset_bitfield = other.__isset_bitfield;
+      this.success = other.success;
+    }
+
+    public deleteImageByPath_result deepCopy() {
+      return new deleteImageByPath_result(this);
+    }
+
+    @Override
+    public void clear() {
+      setSuccessIsSet(false);
+      this.success = false;
+    }
+
+    public boolean isSuccess() {
+      return this.success;
+    }
+
+    public deleteImageByPath_result setSuccess(boolean success) {
+      this.success = success;
+      setSuccessIsSet(true);
+      return this;
+    }
+
+    public void unsetSuccess() {
+      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((Boolean)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return Boolean.valueOf(isSuccess());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof deleteImageByPath_result)
+        return this.equals((deleteImageByPath_result)that);
+      return false;
+    }
+
+    public boolean equals(deleteImageByPath_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true;
+      boolean that_present_success = true;
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (this.success != that.success)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    @Override
+    public int compareTo(deleteImageByPath_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("deleteImageByPath_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      sb.append(this.success);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bitfield = 0;
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private static class deleteImageByPath_resultStandardSchemeFactory implements SchemeFactory {
+      public deleteImageByPath_resultStandardScheme getScheme() {
+        return new deleteImageByPath_resultStandardScheme();
+      }
+    }
+
+    private static class deleteImageByPath_resultStandardScheme extends StandardScheme<deleteImageByPath_result> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageByPath_result struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            case 0: // SUCCESS
+              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+                struct.success = iprot.readBool();
+                struct.setSuccessIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
+        }
+        iprot.readStructEnd();
+
+        // check for required fields of primitive type, which can't be checked in the validate method
+        struct.validate();
+      }
+
+      public void write(org.apache.thrift.protocol.TProtocol oprot, deleteImageByPath_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.isSetSuccess()) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeBool(struct.success);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class deleteImageByPath_resultTupleSchemeFactory implements SchemeFactory {
+      public deleteImageByPath_resultTupleScheme getScheme() {
+        return new deleteImageByPath_resultTupleScheme();
+      }
+    }
+
+    private static class deleteImageByPath_resultTupleScheme extends TupleScheme<deleteImageByPath_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageByPath_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetSuccess()) {
+          optionals.set(0);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          oprot.writeBool(struct.success);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageByPath_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.success = iprot.readBool();
+          struct.setSuccessIsSet(true);
+        }
+      }
+    }
+
+  }
+
   public static class connectedToLecture_args implements org.apache.thrift.TBase<connectedToLecture_args, connectedToLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<connectedToLecture_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("connectedToLecture_args");