From 30c7310d7b166fd5a1eb4e38ee34f33ed9588858 Mon Sep 17 00:00:00 2001
From: unknown
Date: Thu, 24 Apr 2014 09:22:33 +0200
Subject: dghgf

---
 Dozentenmodulserver/bin/server/ServerHandler.class | Bin 14058 -> 14243 bytes
 Dozentenmodulserver/bin/sql/SQL.class              | Bin 15633 -> 16032 bytes
 Dozentenmodulserver/src/server/ServerHandler.java  |  20 +++++++-------------
 Dozentenmodulserver/src/sql/SQL.java               |  16 ++++++++++++++++
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class
index c4b6ae65..580c257d 100644
Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index 6187791d..7be49187 100644
Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 48013b3d..029538c5 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -369,27 +369,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
@@ -409,7 +406,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 5c5b0ec6..9f764762 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -536,4 +536,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;
+	}
 }
-- 
cgit v1.2.3-55-g7522