Add suggestion to check top element before first grandchild element.

slub · Oct 23, 2023 · 4d177b7 · 4d177b7
1 parent 24b518d
commit 4d177b7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/VariableReplacer.java b/Kitodo/src/main/java/org/kitodo/production/helper/VariableReplacer.java
@@ -21,6 +21,7 @@
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.kitodo.api.dataformat.LogicalDivision;
@@ -373,6 +374,9 @@ private String determineReplacementForMetadata(Matcher variableFinder) {
                 if (!allChildren.isEmpty()) {
                     allFirstchildValue = MetadataEditor.getMetadataValue(allChildren.get(0), variableFinder.group(5));
                     if (Objects.isNull(allFirstchildValue)) {
+                        allFirstchildValue = determineReplacementForTopstruct(variableFinder, dollarSignIfToKeep);
+                    }
+                    if (Objects.isNull(allFirstchildValue) || StringUtils.isEmpty(allFirstchildValue)) {
                         List<LogicalDivision> firstChildChildren = allChildren.get(0).getChildren();
                         if (!firstChildChildren.isEmpty()) {
                             allFirstchildValue = MetadataEditor.getMetadataValue(firstChildChildren.get(0), variableFinder.group(5));