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

Conflicts: delete Image db and server
	Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/sql/SQL.class
	Dozentenmodulserver/src/sql/SQL.java

1 files changed, 53 insertions, 1 deletions

diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 16a2ba7e..a707954b 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -313,8 +313,60 @@ public class ServerHandler implements Server.Iface {
 			boolean isActive, String imagename, String firstname,
 			String lastname, String university, String Mail, String Tel,
 			String Fak, String id) throws TException {
-		// TODO Auto-generated method stub
+		int pk_image=0;
+		int imageversion=0;
+		ResultSet image=sql.getImageIDandVersion(con, imagename);
+
+		try {
+			while(image.next())
+			{
+			pk_image=image.getInt("GUID_imageID");
+			imageversion=image.getInt("imageVersion");
+			}
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		sql.updateLectureData(con, pk_image, imageversion, lastname, newName, desc, shortdesc, startDate, endDate, isActive, id);
 		return false;
 	}
+	
+	@Override
+	public boolean deleteImageServer(String imageid, String imageversion) throws TException{
+		 /*
+		  * 
+		  * 
+		  * 
+		  * File noch iniziieren
+		  */
+		//File tmpFile=new File("141.79.128.102:/srv/openslx/nfs/temp/");
+		File tmpFile = null;
+		
+		try {
+			//File wird von Server gelöscht
+			FileUtils.forceDelete(tmpFile);
+			
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public boolean deleteImage(String id, String version) throws TException {
+
+		return sql.deleteImage(con, id, version);
+	}
+
+
+	@Override
+	public boolean connectedToEvents(String imageid, String imageversion)
+			throws TException {
+		
+		return sql.connectedToEvents(con, imageid, imageversion);
+	}
 
 }