Skip to content
Snippets Groups Projects
Commit 4b8c95f6 authored by Wai Yi Leung's avatar Wai Yi Leung
Browse files

Fix RPKM directory path from config

parent 9e88effb
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,11 @@ class Ln(val root: Configurable) extends InProcessFunction with Configurable { ...@@ -32,6 +32,11 @@ class Ln(val root: Configurable) extends InProcessFunction with Configurable {
var relative: Boolean = true var relative: Boolean = true
override def freezeFieldValues(): Unit = {
jobOutputFile = new File(out.getParent + File.separator + "." + out.getName + "." + this.analysisName + ".out")
super.freezeFieldValues()
}
lazy val cmd: String = { lazy val cmd: String = {
lazy val inCanonical: String = { lazy val inCanonical: String = {
// need to remove "/~" to correctly expand path with tilde // need to remove "/~" to correctly expand path with tilde
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
package nl.lumc.sasc.biopet.pipelines.kopisu package nl.lumc.sasc.biopet.pipelines.kopisu
import java.io.{ BufferedWriter, FileWriter, File } import java.io.{ FileFilter, BufferedWriter, FileWriter, File }
import nl.lumc.sasc.biopet.core.{ PipelineCommand, _ } import nl.lumc.sasc.biopet.core.{ PipelineCommand, _ }
import nl.lumc.sasc.biopet.core.config._ import nl.lumc.sasc.biopet.core.config._
...@@ -86,11 +86,16 @@ class ConiferPipeline(val root: Configurable) extends QScript with BiopetQScript ...@@ -86,11 +86,16 @@ class ConiferPipeline(val root: Configurable) extends QScript with BiopetQScript
if (!RPKMonly) { if (!RPKMonly) {
/** Collect the rpkm_output to a temp directory, where we merge with the control files */ /** Collect the rpkm_output to a temp directory, where we merge with the control files */
var refRPKMlist: List[File] = Nil var refRPKMlist: List[File] = Nil
for (f <- controlsDir.listFiles()) { // Sync the .txt only, these files contain the RPKM Values
var target = new File(RPKMdir + File.separator + f.getName) for (controlRPKMfile <- controlsDir.list.filter(_.toLowerCase.endsWith(".txt"))) {
val target = new File(RPKMdir + File.separator + controlRPKMfile.getName)
val source = new File(controlsDir + File.separator + controlRPKMfile)
if (!target.exists()) { if (!target.exists()) {
logger.info("Creating " + target.getAbsolutePath) add(Ln(this, source, target, false))
add(Ln(this, f, target, true)) refRPKMlist :+= target
} else if (!target.equals(source)) {
target.delete()
add(Ln(this, source, target, false))
refRPKMlist :+= target refRPKMlist :+= target
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment