Skip to content

Commit f038477

Browse files
committed
Allow ReadsetHandlerJob to act on the correct set of inputs
1 parent 9393231 commit f038477

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
name: Build DISCVR
22
on:
3+
workflow_dispatch:
34
push:
45
pull_request:
6+
schedule:
7+
- cron: '0 3 * * *'
58
jobs:
69
build-modules:
710
# See: https://help.github.com/en/actions/reference/contexts-and-expression-syntax-for-github-actions#github-context

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequenceReadsetHandlerJob.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
import java.io.IOException;
2020
import java.util.ArrayList;
2121
import java.util.List;
22+
import java.util.stream.Collectors;
2223

2324
/**
2425
* Created by bimber on 1/16/2015.
2526
*/
2627
public class SequenceReadsetHandlerJob extends SequenceJob implements HasJobParams
2728
{
2829
private String _handlerClassName;
30+
private List<Integer> _readsetIds;
2931

3032
// Default constructor for serialization
3133
protected SequenceReadsetHandlerJob()
@@ -39,9 +41,11 @@ public SequenceReadsetHandlerJob(Container c, User user, @Nullable String jobNam
3941
_handlerClassName = handler.getClass().getName();
4042

4143
//for the purpose of caching files:
44+
_readsetIds = new ArrayList<>();
4245
for (SequenceReadsetImpl rs : readsets)
4346
{
4447
getSequenceSupport().cacheReadset(rs);
48+
_readsetIds.add(rs.getReadsetId());
4549
}
4650
}
4751

@@ -64,7 +68,7 @@ public SequenceOutputHandler<SequenceOutputHandler.SequenceReadsetProcessor> get
6468

6569
public List<Readset> getReadsets()
6670
{
67-
return getSequenceSupport().getCachedReadsets();
71+
return getReadsetIds().stream().map(getSequenceSupport()::getCachedReadset).collect(Collectors.toList());
6872
}
6973

7074
@Override
@@ -94,4 +98,14 @@ public List<File> getInputFiles()
9498

9599
return null;
96100
}
101+
102+
public List<Integer> getReadsetIds()
103+
{
104+
return _readsetIds;
105+
}
106+
107+
public void setReadsetIds(List<Integer> readsetIds)
108+
{
109+
_readsetIds = readsetIds;
110+
}
97111
}

0 commit comments

Comments
 (0)