119687: Solr date sort field format check fix

atmire · Oct 30, 2024 · 56becc6 · 56becc6
1 parent c35d7a6
commit 56becc6
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/sort/OrderFormatDate.java b/dspace-api/src/main/java/org/dspace/sort/OrderFormatDate.java
@@ -21,6 +21,10 @@ public class OrderFormatDate implements OrderFormatDelegate {
 
     @Override
     public String makeSortString(String value, String language) {
+        if (!isValidDate(value)) {
+            return null;
+        }
+
         int padding = 0;
         int endYearIdx = value.indexOf('-');
 
@@ -30,18 +34,13 @@ public String makeSortString(String value, String language) {
             padding = 4 - value.length();
         }
 
-        String newValue = value;
         if (padding > 0) {
             // padding the value from left with 0 so that 87 -> 0087, 687-11-24
             // -> 0687-11-24
-            newValue = String.format("%1$0" + padding + "d", 0)
+            return String.format("%1$0" + padding + "d", 0)
                 + value;
-        }
-
-        if (isValidDate(newValue)) {
-            return newValue;
         } else {
-            return null;
+            return value;
         }
     }