From 974156b37083b566ca71f61c37663b434955efa5 Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Wed, 28 Oct 2015 16:29:42 +0100
Subject: [PATCH] Fixed md5 check
---
.../biopet/core/summary/SummaryQScript.scala | 29 ++++++++++---------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/summary/SummaryQScript.scala b/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/summary/SummaryQScript.scala
index ab2f64546..264800c70 100644
--- a/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/summary/SummaryQScript.scala
+++ b/public/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/summary/SummaryQScript.scala
@@ -116,20 +116,6 @@ trait SummaryQScript extends BiopetQScript { qscript =>
//TODO: add more checksums types
}
- for (inputFile <- inputFiles) {
- inputFile.md5 match {
- case Some(checksum) => {
- val checkMd5 = new CheckChecksum
- checkMd5.inputFile = inputFile.file
- require(SummaryQScript.md5sumCache.contains(inputFile.file), "Md5 job is not executed, checksum file can't be found")
- checkMd5.checksumFile = SummaryQScript.md5sumCache(inputFile.file)
- checkMd5.checksum = checksum
- add(checkMd5)
- }
- case _ =>
- }
- }
-
for ((_, summarizableList) <- summarizables; summarizable <- summarizableList) {
summarizable match {
case f: BiopetCommandLineFunction => f.beforeGraph()
@@ -146,6 +132,21 @@ trait SummaryQScript extends BiopetQScript { qscript =>
}
}
+ for (inputFile <- inputFiles) {
+ inputFile.md5 match {
+ case Some(checksum) => {
+ val checkMd5 = new CheckChecksum
+ checkMd5.inputFile = inputFile.file
+ require(SummaryQScript.md5sumCache.contains(inputFile.file),
+ s"Md5 job is not executed, checksum file can't be found for: ${inputFile.file}")
+ checkMd5.checksumFile = SummaryQScript.md5sumCache(inputFile.file)
+ checkMd5.checksum = checksum
+ add(checkMd5)
+ }
+ case _ =>
+ }
+ }
+
for ((_, file) <- this.summaryFiles)
addChecksum(file)
--
GitLab