From 0e5a2fad51b45cd881660e6e5cdc81a395e90e0f Mon Sep 17 00:00:00 2001
From: bow <bow@bow.web.id>
Date: Sat, 4 Apr 2015 15:42:58 +0200
Subject: [PATCH] Add meta information in root of summary
---
.../lumc/sasc/biopet/core/summary/WriteSummary.scala | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/summary/WriteSummary.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/summary/WriteSummary.scala
index 931157964..cf117f9ad 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/summary/WriteSummary.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/summary/WriteSummary.scala
@@ -22,11 +22,11 @@ import scala.io.Source
import org.broadinstitute.gatk.queue.function.{ QFunction, InProcessFunction }
import org.broadinstitute.gatk.utils.commandline.{ Output, Input }
+import nl.lumc.sasc.biopet.{ LastCommitHash, Version }
import nl.lumc.sasc.biopet.core.{ BiopetJavaCommandLineFunction, BiopetCommandLineFunction, BiopetCommandLineFunctionTrait, SampleLibraryTag }
import nl.lumc.sasc.biopet.core.config.Configurable
import nl.lumc.sasc.biopet.utils.ConfigUtils
-
/**
* Created by pjvan_thof on 2/14/15.
*/
@@ -106,9 +106,13 @@ class WriteSummary(val root: Configurable) extends InProcessFunction with Config
(v1: Any, v2: Any, key: String) => summarizable.resolveSummaryConflict(v1, v2, key))
}).foldRight(pipelineMap)((a, b) => ConfigUtils.mergeMaps(a._1, b, a._2))
- val combinedMap = (for (qscript <- qscript.summaryQScripts) yield {
- ConfigUtils.fileToConfigMap(qscript.summaryFile)
- }).foldRight(jobsMap)((a, b) => ConfigUtils.mergeMaps(a, b))
+ val combinedMap = Map("meta" -> Map(
+ "last_commit_hash" -> LastCommitHash,
+ "pipeline_version" -> Version
+ )) ++
+ (for (qscript <- qscript.summaryQScripts) yield {
+ ConfigUtils.fileToConfigMap(qscript.summaryFile)
+ }).foldRight(jobsMap)((a, b) => ConfigUtils.mergeMaps(a, b))
val writer = new PrintWriter(out)
writer.println(ConfigUtils.mapToJson(combinedMap).spaces4)
--
GitLab