hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9789 from tdonohue/port_9497_to_7x

Browse Source 
[Port dspace-7_x] In workflow-attached curation, separate task-list building from execution.
This commit is contained in:
Tim Donohue
2024-08-29 12:11:20 -05:00
committed by GitHub
parent e570135689 0d74bd9f18
commit 94fca6fe35
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java
View File

@@ -140,14 +140,14 @@ public class XmlWorkflowCuratorServiceImpl
item.setOwningCollection(wfi.getCollection()); item.setOwningCollection(wfi.getCollection());
for (Task task : step.tasks) { for (Task task : step.tasks) {
curator.addTask(task.name); curator.addTask(task.name);
}
// Check whether the task is configured to be queued rather than automatically run if (StringUtils.isNotEmpty(step.queue)) { // Step's tasks are to be queued.
if (StringUtils.isNotEmpty(step.queue)) { curator.queue(c, item.getID().toString(), step.queue);
// queue attribute has been set in the FlowStep configuration: add task to configured queue } else { // Step's tasks are to be run now.
curator.queue(c, item.getID().toString(), step.queue); curator.curate(c, item);
} else {
// Task is configured to be run automatically for (Task task : step.tasks) {
curator.curate(c, item);
int status = curator.getStatus(task.name); int status = curator.getStatus(task.name);
String result = curator.getResult(task.name); String result = curator.getResult(task.name);
String action = "none"; String action = "none";
@@ -184,14 +184,14 @@ public class XmlWorkflowCuratorServiceImpl
} }
} }
curator.clear(); curator.clear();
}
// Record any reporting done by the tasks. // Record any reporting done by the tasks.
if (reporter.length() > 0) { if (reporter.length() > 0) {
LOG.info("Curation tasks over item {} for step {} report:%n{}", LOG.info("Curation tasks over item {} for step {} report:\n{}",
() -> wfi.getItem().getID(), () -> wfi.getItem().getID(),
() -> step.step, () -> step.step,
() -> reporter.toString()); () -> reporter.toString());
}
} }
} }
return true; return true;

12
dspace-api/src/main/java/org/dspace/curate/package-info.java
View File

@@ -20,6 +20,8 @@
* </dl> * </dl>
* *
* <p>Curation requests may be run immediately or queued for batch processing. * <p>Curation requests may be run immediately or queued for batch processing.
* See {@link TaskQueue} and its relatives, {@link Curation} and its relatives
* for more on queued curation.
* *
* <p>Tasks may also be attached to a workflow step, so that a set of tasks is * <p>Tasks may also be attached to a workflow step, so that a set of tasks is
* applied to each uninstalled Item which passes through that step. See * applied to each uninstalled Item which passes through that step. See
@@ -27,5 +29,15 @@
* *
* <p>A task may return to the Curator a status code, a final status message, * <p>A task may return to the Curator a status code, a final status message,
* and an optional report character stream. * and an optional report character stream.
*
* <p>The {@link Reporter} classes absorb strings of text and preserve it in
* various ways. A Reporter is a simple {@link Appendable} and makes no
* assumptions about e.g. whether a string represents a complete line. If you
* want your report formatted, insert appropriate newlines and other whitespace
* as needed. Your tasks can emit marked-up text if you wish, but the stock
* Reporter implementations make no attempt to render it.
*
* <p>Tasks may be annotated to inform the Curator of special properties. See
* {@link Distributive}, {@link Mutative}, {@link Suspendable} etc.
*/ */
package org.dspace.curate; package org.dspace.curate;