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

4 files changed, 23 insertions, 13 deletions

diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class
index 221d0bbd..95ad3b3f 100644
--- a/Dozentenmodulserver/bin/server/ServerHandler.class
+++ b/Dozentenmodulserver/bin/server/ServerHandler.class
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index 8e11f714..83234945 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index d8099b7b..5e736554 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -380,27 +380,24 @@ public class ServerHandler implements Server.Iface {
 	
 	@Override
 	public boolean deleteImageServer(String imageid, String imageversion) throws TException{
-		 /*
-		  * 
-		  * 
-		  * 
-		  * File noch iniziieren
-		  */
-		// Pfad der Datei aus der DB auslesen und hier eintragen
-		//File tmpFile=new File("127.0.0.1:/srv/openslx/nfs/temp/");
-		File tmpFile = null;
+
+		String stringFile = sql.getFile(con, imageid, imageversion);
+	
+		File tmpFile = new File("127.0.0.1:" + stringFile);
 		
 		try {
 			//File wird von Server gelöscht
 			FileUtils.forceDelete(tmpFile);
 			
+			return true;
+			
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 
 		}
 		
-		return true;
+		return false;
 	}
 	
 	@Override
@@ -420,7 +417,4 @@ public class ServerHandler implements Server.Iface {
 		return sql.deleteLecture(con, id);
 	}
 
-
-
-
 }
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index decdbf89..d85068e8 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -538,4 +538,20 @@ public class SQL {
 		

 		return false;

 	}

+

+	public String getFile(Connection con, String imageid, String imageversion) {

+		

+		try {

+			Statement stm = con.createStatement();

+

+			return stm.executeQuery("SELECT image_path FROM bwLehrpool.m_VLData_imageInfo WHERE imageID = '" + imageid

+					+ "' AND imageVersion = '" + imageversion + "';").toString();

+

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+

+		return null;

+	}

 }