Skip to content

[3.9] Handle addition of structure elements in unsaved processes #7247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solth merged 2 commits into from
Sep 14, 2026
Merged

[3.9] Handle addition of structure elements in unsaved processes #7247

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3e7f4d
Handle addition of structure elements in unsaved processes
BartChris Sep 9, 2026
111b471
Add non-null check
BartChris Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions Kitodo/src/main/java/org/kitodo/production/metadata/MetadataEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public static LogicalDivision addLogicalDivision(String type, Workpiece workpiec
handlePosition(workpiece, logicalDivision, position, viewsToAdd, parents, siblings, newStructure);

if (Objects.nonNull(viewsToAdd) && !viewsToAdd.isEmpty()) {
handleViewsToAdd(viewsToAdd, newStructure);
handleViewsToAdd(viewsToAdd, newStructure, workpiece.getLogicalStructure());
}
return newStructure;
}
Expand Down Expand Up @@ -352,11 +352,18 @@ private static void handlePosition(Workpiece workpiece, LogicalDivision logicalD
}
}

private static void handleViewsToAdd(List<View> viewsToAdd, LogicalDivision newStructure) {
private static void handleViewsToAdd(List<View> viewsToAdd, LogicalDivision newStructure,
LogicalDivision rootStructure) {
for (View viewToAdd : viewsToAdd) {
List<LogicalDivision> logicalDivisions = viewToAdd.getPhysicalDivision().getLogicalDivisions();
for (LogicalDivision elementToUnassign : logicalDivisions) {
elementToUnassign.getViews().remove(viewToAdd);
if (logicalDivisions.isEmpty() && Objects.nonNull(rootStructure)) {
// In an unsaved process, unstructured media may not yet have
// the root logical division registered explicitly.
rootStructure.getViews().remove(viewToAdd);
} else {
for (LogicalDivision elementToUnassign : logicalDivisions) {
elementToUnassign.getViews().remove(viewToAdd);
}
}
logicalDivisions.clear();
logicalDivisions.add(newStructure);
Expand Down
Loading