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

2 files changed, 84 insertions, 2 deletions

diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java
index da1d424a..7793035c 100644
--- a/Dozentenmodulserver/src/server/Server.java
+++ b/Dozentenmodulserver/src/server/Server.java
@@ -66,6 +66,12 @@ public class Server {
 
     public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException;
 
+	public boolean deleteImage(String id, String version) throws org.apache.thrift.TException;
+
+	public boolean deleteImageServer(String imageid, String imageversion) throws org.apache.thrift.TException;
+	
+	public boolean connectedToEvents(String imageid, String imageversion) throws org.apache.thrift.TException;
+
   }
 
   public interface AsyncIface {
@@ -452,7 +458,7 @@ public class Server {
 		
 		SQL sql = new SQL();
 		
-		return sql.deleteImage( imageid, imageversion);
+		return sql.deleteImage(sql.getConnection(), imageid, imageversion);
 	}
 
     public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException
@@ -492,6 +498,30 @@ public class Server {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateLecturedata failed: unknown result");
     }
 
+	@Override
+	public boolean deleteImage(String id, String version) throws TException {
+		
+		SQL sql = new SQL();
+		
+		return sql.deleteImage(sql.getConnection(), id, version);
+	}
+
+	@Override
+	public boolean deleteImageServer(String imageid, String imageversion)
+			throws TException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean connectedToEvents(String imageid, String imageversion)
+			throws TException {
+		
+		SQL sql = new SQL();
+		
+		return sql.connectedToEvents(sql.getConnection(), imageid, imageversion);
+	}
+
   }
   public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
     public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
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);
+	}
 
 }