First attempt to ignore images whose entity is marked as deleted

dainst · Nov 22, 2024 · ae30b3e · ae30b3e
1 parent c3727e7
commit ae30b3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/backend/src/main/java/de/uni_koeln/arachne/dao/jdbc/GenericSQLDao.java b/backend/src/main/java/de/uni_koeln/arachne/dao/jdbc/GenericSQLDao.java
@@ -274,7 +274,7 @@ public List<Image> getImageList(final String type, final long internalId) {
 			final String sql = "SELECT `marbilder`.`DateinameMarbilder`, `arachneentityidentification`.`ArachneEntityID`, `marbilder`.`EntityOrder`"
 					+ "FROM `marbilder` " + "LEFT JOIN `arachneentityidentification` "
 					+ "ON (`arachneentityidentification`.`TableName` = 'marbilder' "
-					+ "AND `arachneentityidentification`.`ForeignKey` = `marbilder`.`PS_MARBilderID`) " + "WHERE "
+					+ "AND `arachneentityidentification`.`ForeignKey` = `marbilder`.`PS_MARBilderID` AND `arachneentityidentification`.`deleted` = 0) " + "WHERE "
 					+ SQLToolbox.getQualifiedFieldname("marbilder", SQLToolbox.generateForeignKeyName(type)) + " = ? "
 					+ "ORDER BY `marbilder`.`EntityOrder` ASC"
 					+ userRightsService.getSQL("marbilder");

diff --git a/backend/src/main/java/de/uni_koeln/arachne/service/ImageService.java b/backend/src/main/java/de/uni_koeln/arachne/service/ImageService.java
@@ -57,7 +57,7 @@ public void addImages(final Dataset dataset) {
 		if (excludeList.contains(arachneId.getTableName())) {
 			return;
 		} else {
-			if ("marbilder".equals(arachneId.getTableName())) {
+			if ("marbilder".equals(arachneId.getTableName()) && !arachneId.deleted) {
 				final Image image = new Image();
 				image.setImageId(arachneId.getArachneEntityID());
 				String fileName = dataset.getField("marbilder.DateinameMarbilder");