diff --git a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Zcat.scala b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Zcat.scala index 5c7ebd0ca6382584bc45b455527e50bdede1a673..be5eb6700c6c1610c33c0e1f0fa132089db81bfc 100644 --- a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Zcat.scala +++ b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Zcat.scala @@ -36,7 +36,7 @@ class Zcat(val root: Configurable) extends BiopetCommandLineFunction { /** Returns command to execute */ def cmdLine = required(executable) + - (if (inputAsStdin) "" else required(input)) + + (if (inputAsStdin) "" else repeat(input)) + (if (outputAsStsout) "" else " > " + required(output)) } diff --git a/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala b/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala index 7b61aa4f9a46fd9c2034ce08b2a38df545e4af53..e53c55cc53bd4cddab07de2d1fe7a1f5bc25feb9 100644 --- a/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala +++ b/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Flexiprep.scala @@ -253,8 +253,14 @@ class Flexiprep(val root: Configurable) extends QScript with SummaryQScript with throw new IllegalStateException("R1 and R2 file number is not the same") if (fastq_R1.length > 1) { - add(Zcat(this, fastq_R1, fastqR1Qc) | new Gzip(this) > fastqR1Qc) - if (paired) add(Zcat(this, fastq_R2, fastqR2Qc.get) | new Gzip(this) > fastqR2Qc.get) + val zcat = new Zcat(this) + zcat.input = fastq_R1 + add(zcat | new Gzip(this) > fastqR1Qc) + if (paired) { + val zcat = new Zcat(this) + zcat.input = fastq_R2 + add(zcat | new Gzip(this) > fastqR2Qc.get) + } } outputFiles += ("output_R1_gzip" -> fastqR1Qc)