Skip to content
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

Jump to bottom

Fix deleting object's linked DIPS increments the processed obejct count #3285

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Fix deleting object's linked DIPS increments the processed obejct count #3285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions ...ore/src/main/java/org/roda/core/plugins/base/maintenance/DeleteRodaObjectPluginUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static void process(final IndexService index, final ModelService model, f
} else if (object instanceof RiskIncidence) {
processRiskIncidence(model, report, jobPluginInfo, cachedJob, plugin, (RiskIncidence) object, doReport);
} else if (object instanceof DIP) {
processDIP(model, report, jobPluginInfo, cachedJob, plugin, (DIP) object, doReport);
processDIP(model, report, jobPluginInfo, cachedJob, plugin, (DIP) object, doReport, true);
} else if (object instanceof DIPFile) {
processDIPFile(model, report, jobPluginInfo, cachedJob, plugin, (DIPFile) object, doReport);
}
Expand Down Expand Up @@ -513,7 +513,7 @@ private static void processLinkedDIP(IsRODAObject object, IndexService index, Mo
}

if (aipIds.isEmpty() && representationIds.isEmpty() && fileIds.isEmpty()) {
processDIP(model, report, jobPluginInfo, job, plugin, dip, false);
processDIP(model, report, jobPluginInfo, job, plugin, dip, false, false);
} else {
model.updateDIP(dip);
}
Expand All @@ -524,7 +524,7 @@ private static void processLinkedDIP(IsRODAObject object, IndexService index, Mo
}

private static void processDIP(ModelService model, Report report, JobPluginInfo jobPluginInfo, Job job,
final Plugin<? extends IsRODAObject> plugin, DIP dip, final boolean doReport) {
final Plugin<? extends IsRODAObject> plugin, DIP dip, final boolean doReport, final boolean incrementObjects) {
Optional<String> deletePlugin = DIPUtils.getDeletePlugin(dip);

if (deletePlugin.isPresent()) {
Expand All @@ -543,7 +543,9 @@ private static void processDIP(ModelService model, Report report, JobPluginInfo
report.addReport(reportItem.setPluginState(state));
PluginHelper.updatePartialJobReport(plugin, model, reportItem, true, job);
}
jobPluginInfo.incrementObjectsProcessed(state);
if (incrementObjects) {
jobPluginInfo.incrementObjectsProcessed(state);
}
}
}

Expand Down
Loading