Skip to content

Commit

Permalink
Deleting linked DIPs now longer increments objects processed (#3285)
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandre Flores <[email protected]>
  • Loading branch information
SugaryLump authored and hmiguim committed Nov 27, 2024
1 parent 7eddac8 commit cd41d77
Showing 1 changed file with 6 additions and 4 deletions.
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

0 comments on commit cd41d77

Please sign in to comment.