Skip to content

Commit

Permalink
- Fixed sorting of deposits for import job (now really done by creati…
Browse files Browse the repository at this point in the history
…on.timestamp).

- Added some logging so diagnosing problems with deposit order will be easier in the future.
  • Loading branch information
janvanmansum committed Feb 6, 2025
1 parent 5d0c9ce commit dbf64ce
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/main/java/nl/knaw/dans/dvingest/core/ImportJob.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,20 @@ private TreeSet<DataverseIngestDeposit> createDataverseIngestDeposits() throws I
var deposits = new TreeSet<DataverseIngestDeposit>();

if (importCommand.getSingleObject()) {
log.debug("Creating single deposit job from path: {}", importCommand.getPath());
deposits.add(depositFactory.createDataverseIngestDeposit(Path.of(importCommand.getPath())));
}
else {
log.debug("Creating batch deposit job from path: {}", importCommand.getPath());
try (var depositPaths = Files.list(Path.of(importCommand.getPath()))) {
depositPaths.filter(Files::isDirectory)
.sorted()
.map(depositFactory::createDataverseIngestDeposit)
.sorted()
.forEach(deposits::add);
}
if (log.isDebugEnabled()) {
log.debug("Deposits will be processed in this order: {}", deposits.stream().map(DataverseIngestDeposit::getId).toList());
}
}
return deposits;
}
Expand Down

0 comments on commit dbf64ce

Please sign in to comment.