Adjust image comparator function

dainst · Oct 2, 2024 · 09e2487 · 09e2487
1 parent a83e97a
commit 09e2487
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
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
@@ -271,7 +271,7 @@ public List<Map<String, String>> getPathConnectedEntities(final long entityId, f
 	 */
 	public List<Image> getImageList(final String type, final long internalId) {
 		List<Image> result = query(con -> {
-			final String sql = "SELECT `marbilder`.`DateinameMarbilder`, `arachneentityidentification`.`ArachneEntityID` "
+			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 "
@@ -290,6 +290,7 @@ public List<Image> getImageList(final String type, final long internalId) {
 				dataIntegrityLogService.logWarning(rs.getLong(2), "PS_MARBilderID", "Image without filename.");
 			}
 			image.setImageId(rs.getLong(2));
+			image.setEntityOrder(rs.getInteger(3));
 			return image;
 		});
 

diff --git a/backend/src/main/java/de/uni_koeln/arachne/response/Image.java b/backend/src/main/java/de/uni_koeln/arachne/response/Image.java
@@ -29,6 +29,11 @@ public class Image {
 	 * The category of the record, the image is assigned to
 	 */
 	protected String sourceContext;
+
+	/**
+	 * Defines the order when displayed together with images linked to same entity.
+	 */
+	protected Integer entityOrder = 0;
 
 
 	public Long getImageId() {
@@ -39,6 +44,14 @@ public void setImageId(final Long imageId) {
 		this.imageId = imageId;
 	}
 
+	public Integer getEntityOrder() {
+		return entityOrder;
+	}
+
+	public void setEntityOrder(final Integer order) {
+		this.entityOrder = order;
+	}
+
 	public String getImageSubtitle() {
 		return imageSubtitle;
 	}

diff --git a/backend/src/main/java/de/uni_koeln/arachne/service/ContextService.java b/backend/src/main/java/de/uni_koeln/arachne/service/ContextService.java
@@ -187,6 +187,7 @@ private void addContextImages(final Dataset parent, final String lang) throws Tr
 						final long imageId = Long.parseLong(currentContext.get("SemanticConnection.EntityID"));
 						image.setImageId(imageId);
 						image.setImageSubtitle(currentContext.get("marbilder.DateinameMarbilder"));
+						image.setEntityOrder(currentContext.get("marbilder.EntityOrder"))
 						image.setSourceContext(ts.transl8(contextName, lang));
 						final long sourceRecordId = Long.parseLong(currentContext.get("SemanticConnection.ForeignKeyTarget"));
 						image.setSourceRecordId(sourceRecordId);

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
@@ -62,6 +62,7 @@ public void addImages(final Dataset dataset) {
 				image.setImageId(arachneId.getArachneEntityID());
 				String fileName = dataset.getField("marbilder.DateinameMarbilder");
 				image.setImageSubtitle(fileName.substring(0, fileName.lastIndexOf('.')));
+				image.setEntityOrder(dataset.getField("marbilder.EntityOrder"));
 				final List<Image> imageList = new ArrayList<Image>();
 				imageList.add(image);
 				dataset.setImages(imageList);