diff --git a/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsFlagstat.scala b/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsFlagstat.scala index 387f0ef83921265a2a206bc518456b18c147a596..950c26b6d3456b85f4214b0b6f076fb015601be4 100644 --- a/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsFlagstat.scala +++ b/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsFlagstat.scala @@ -28,7 +28,9 @@ class SamtoolsFlagstat(val root: Configurable) extends Samtools { var output: File = _ /** Returns command to execute */ - def cmdLine = required(executable) + required("flagstat") + required(input) + " > " + required(output) + def cmdLine = required(executable) + required("flagstat") + + (if (inputAsStdin) "-" else required(input)) + + (if (outputAsStsout) "" else " > " + required(output)) } object SamtoolsFlagstat { diff --git a/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsView.scala b/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsView.scala index ad87ddc31fb409959450e784c0e3091329c54d67..3ef8756c28831e505d2a558d96c5aaf14c8ab989 100644 --- a/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsView.scala +++ b/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/samtools/SamtoolsView.scala @@ -33,18 +33,20 @@ class SamtoolsView(val root: Configurable) extends Samtools { var f: List[String] = config("f", default = List.empty[String]) var F: List[String] = config("F", default = List.empty[String]) - def cmdBase = required(executable) + + @Input(required = false) + var L: Option[File] = None + + /** Returns command to execute */ + def cmdLine = required(executable) + required("view") + optional("-q", q) + + optional("-L", L) + repeat("-f", f) + repeat("-F", F) + conditional(b, "-b") + - conditional(h, "-h") - def cmdPipeInput = cmdBase + "-" - def cmdPipe = cmdBase + required(input) - - /** Returns command to execute */ - def cmdLine = cmdPipe + " > " + required(output) + conditional(h, "-h") + + (if (inputAsStdin) "-" else required(input)) + + (if (outputAsStsout) "" else " > " + required(output)) } object SamtoolsView {