Skip to content

Commit 42a34ee

Browse files
committed
UpdateSeuratPrototype now updates DB record
1 parent 4546771 commit 42a34ee

3 files changed

Lines changed: 15 additions & 14 deletions

File tree

mGAP/src/org/labkey/mgap/pipeline/mGapReleaseGenerator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,9 @@ private File getTrackListFile(File outputDir)
353353
}
354354

355355
@Override
356-
public void complete(PipelineJob job, List<SequenceOutputFile> inputs, List<SequenceOutputFile> outputsCreated, SequenceAnalysisJobSupport support) throws PipelineJobException
356+
public void complete(JobContext ctx, List<SequenceOutputFile> inputs, List<SequenceOutputFile> outputsCreated) throws PipelineJobException
357357
{
358+
PipelineJob job = ctx.getJob();
358359
if (outputsCreated.isEmpty())
359360
{
360361
job.getLogger().error("no outputs found");

primeseq/src/org/labkey/primeseq/analysis/MethylationRateComparisonHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,21 +143,21 @@ public SequenceOutputProcessor getProcessor()
143143
public class Processor implements SequenceOutputProcessor
144144
{
145145
@Override
146-
public void complete(PipelineJob job, List<SequenceOutputFile> inputs, List<SequenceOutputFile> outputsCreated, SequenceAnalysisJobSupport support) throws PipelineJobException
146+
public void complete(JobContext ctx, List<SequenceOutputFile> inputs, List<SequenceOutputFile> outputsCreated) throws PipelineJobException
147147
{
148148
for (SequenceOutputFile so : outputsCreated)
149149
{
150150
if (so.getFile().getName().endsWith(".bed") && METHYLATION_RATE_COMPARISON.equals(so.getCategory()))
151151
{
152-
job.getLogger().debug("preparing JBrowse files: " + so.getFile().getName());
152+
ctx.getJob().getLogger().debug("preparing JBrowse files: " + so.getFile().getName());
153153

154154
JSONObject json = new JSONObject();
155155
json.put("type", "JBrowse/View/Track/Wiggle/XYPlot");
156156
//json.put("max_score", 1);
157157

158158
try
159159
{
160-
JBrowseService.get().prepareOutputFile(job.getUser(), job.getLogger(), so.getRowid(), true, json);
160+
JBrowseService.get().prepareOutputFile(ctx.getJob().getUser(), ctx.getJob().getLogger(), so.getRowid(), true, json);
161161
}
162162
catch (IOException e)
163163
{

tcrdb/src/org/labkey/tcrdb/pipeline/CellRangerVDJCellHashingHandler.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,38 +120,38 @@ public void processFilesOnWebserver(PipelineJob job, SequenceAnalysisJobSupport
120120
}
121121

122122
@Override
123-
public void complete(PipelineJob job, List<SequenceOutputFile> inputFiles, List<SequenceOutputFile> outputsCreated, SequenceAnalysisJobSupport support) throws PipelineJobException
123+
public void complete(JobContext ctx, List<SequenceOutputFile> inputFiles, List<SequenceOutputFile> outputsCreated) throws PipelineJobException
124124
{
125125
for (SequenceOutputFile so : outputsCreated)
126126
{
127127
if (CATEGORY.equals(so.getCategory()))
128128
{
129-
CellHashingService.get().processMetrics(so, job, true);
129+
CellHashingService.get().processMetrics(so, ctx.getJob(), true);
130130
}
131131
}
132132

133-
if (StringUtils.trimToNull(job.getParameters().get(TARGET_ASSAY)) == null)
133+
if (StringUtils.trimToNull(ctx.getJob().getParameters().get(TARGET_ASSAY)) == null)
134134
{
135-
job.getLogger().info("No assay selected, will not import");
135+
ctx.getJob().getLogger().info("No assay selected, will not import");
136136
}
137137
else
138138
{
139-
Integer assayId = ConvertHelper.convert(job.getParameters().get(TARGET_ASSAY), Integer.class);
139+
Integer assayId = ConvertHelper.convert(ctx.getJob().getParameters().get(TARGET_ASSAY), Integer.class);
140140
if (assayId == null)
141141
{
142-
throw new PipelineJobException("Invalid assay Id, cannot import: " + job.getParameters().get(TARGET_ASSAY));
142+
throw new PipelineJobException("Invalid assay Id, cannot import: " + ctx.getJob().getParameters().get(TARGET_ASSAY));
143143
}
144144

145145
boolean deleteExistingData = false;
146-
if (job.getParameters().get(DELETE_EXISTING_ASSAY_DATA) != null)
146+
if (ctx.getJob().getParameters().get(DELETE_EXISTING_ASSAY_DATA) != null)
147147
{
148-
deleteExistingData = ConvertHelper.convert(job.getParameters().get(DELETE_EXISTING_ASSAY_DATA), Boolean.class);
148+
deleteExistingData = ConvertHelper.convert(ctx.getJob().getParameters().get(DELETE_EXISTING_ASSAY_DATA), Boolean.class);
149149
}
150150

151151
for (SequenceOutputFile so : inputFiles)
152152
{
153-
AnalysisModel model = support.getCachedAnalysis(so.getAnalysis_id());
154-
new CellRangerVDJUtils(job.getLogger()).importAssayData(job, model, so.getFile(), job.getLogFile().getParentFile(), assayId, null, deleteExistingData);
153+
AnalysisModel model = ctx.getSequenceSupport().getCachedAnalysis(so.getAnalysis_id());
154+
new CellRangerVDJUtils(ctx.getJob().getLogger()).importAssayData(ctx.getJob(), model, so.getFile(), ctx.getJob().getLogFile().getParentFile(), assayId, null, deleteExistingData);
155155
}
156156
}
157157
}

0 commit comments

Comments
 (0)