Add suggestion to check top element before first grandchild element.

henning-gerhardt · Nov 30, 2023 · d24ce9b · d24ce9b
1 parent 2636e12
commit d24ce9b
Showing 1 changed file with 3 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
@@ -397,6 +397,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));