From 1d9e5d2e9fb830a5d45fe1ecdae1feb0fe122e7d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 29 Oct 2015 16:16:46 +0100
Subject: [server] unlinkLecture: Actually execute query; deleteImgVersion:
 only unlink lectures, don't delete them (as it was planned!)

---
 .../src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java  | 4 ++--
 .../main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
index ace8df01..55fa02b2 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
@@ -640,9 +640,9 @@ public class DbImage {
 
 	public static void deleteVersionPermanently(LocalImageVersion image) throws SQLException {
 		try (MysqlConnection connection = Database.getConnection()) {
-			DbLecture.deletePermanently(connection, image);
 			// Unlink any linked lectures
 			DbLecture.unlinkFromImageVersion(connection, image.imageVersionId);
+			//DbLecture.deletePermanently(connection, image);
 			// Unlink latest version field from image base
 			MysqlStatement unlinkStmt = connection.prepareStatement("UPDATE imagebase SET latestversionid = NULL"
 					+ " WHERE latestversionid = :imageversionid");
@@ -654,7 +654,7 @@ public class DbImage {
 			stmt.executeUpdate();
 			connection.commit();
 		} catch (SQLException e) {
-			LOGGER.error("Query failed in DbImage.deleteVersionPermanently()", e);
+			LOGGER.error("Query failed in DbImage.deleteVersionPermanently(2)", e);
 			throw e;
 		}
 	}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
index 1436aa36..0ed62770 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
@@ -532,6 +532,7 @@ public class DbLecture {
 		MysqlStatement stmt = connection.prepareStatement("UPDATE lecture SET imageversionid = NULL"
 				+ " WHERE imageversionid = :imageversionid");
 		stmt.setString("imageversionid", imageVersionId);
+		stmt.executeUpdate();
 	}
 
 }
-- 
cgit v1.2.3-55-g7522