Commit missing changes

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

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
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,7 +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.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/util/image/ImageComparator.java b/backend/src/main/java/de/uni_koeln/arachne/util/image/ImageComparator.java
@@ -19,26 +19,29 @@ public class ImageComparator implements Comparator<Image>, Serializable {
 
 	@Override
 	public int compare(Image image1, Image image2) {
-		String subTitle1 = image1.getImageSubtitle();
-		String subTitle2 = image2.getImageSubtitle();
 
-		if (subTitle1 == null) {
-			return 0;
-		}
+		return image1.getEntityOrder() - image2.getEntityOrder();
 
-		if (subTitle2 == null) {
-			return 0;
-		}
+		// String subTitle1 = image1.getImageSubtitle();
+		// String subTitle2 = image2.getImageSubtitle();
 
-		// Use Interger.MIN_VALUE / 4 to not generate an overflow;
-		int imageNumber1 = subTitle1.contains(",") ? ImageUtils.extractNumberFromImageFilename(image1.getImageSubtitle()) 
-				: Integer.MIN_VALUE / 4;
-		int imageNumber2 = subTitle2.contains(",") ? ImageUtils.extractNumberFromImageFilename(image2.getImageSubtitle()) 
-				: Integer.MIN_VALUE / 4;
+		// if (subTitle1 == null) {
+		// 	return 0;
+		// }
 
-		LOGGER.debug("Compare: " + subTitle1 + "[" + imageNumber1 + "]" + " - " + subTitle2 + "[" + imageNumber2 + "]");
-		LOGGER.debug("Comparison result : " + (imageNumber1 - imageNumber2));
+		// if (subTitle2 == null) {
+		// 	return 0;
+		// }
+
+		// // Use Interger.MIN_VALUE / 4 to not generate an overflow;
+		// int imageNumber1 = subTitle1.contains(",") ? ImageUtils.extractNumberFromImageFilename(image1.getImageSubtitle()) 
+		// 		: Integer.MIN_VALUE / 4;
+		// int imageNumber2 = subTitle2.contains(",") ? ImageUtils.extractNumberFromImageFilename(image2.getImageSubtitle()) 
+		// 		: Integer.MIN_VALUE / 4;
+
+		// LOGGER.debug("Compare: " + subTitle1 + "[" + imageNumber1 + "]" + " - " + subTitle2 + "[" + imageNumber2 + "]");
+		// LOGGER.debug("Comparison result : " + (imageNumber1 - imageNumber2));
 
-		return imageNumber1 - imageNumber2;
+		// return imageNumber1 - imageNumber2;
 	}
 }