From 6d0f246ad164fc4022d90b39ff87044b550972d6 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@fhi-berlin.mpg.de>
Date: Fri, 26 Jan 2018 10:25:59 +0100
Subject: [PATCH] mproving calculation info normalizer
---
.../normalize/CalculationInfoNormalizer.scala | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/core/src/main/scala/eu/nomad_lab/normalize/CalculationInfoNormalizer.scala b/core/src/main/scala/eu/nomad_lab/normalize/CalculationInfoNormalizer.scala
index cef65478..55191764 100644
--- a/core/src/main/scala/eu/nomad_lab/normalize/CalculationInfoNormalizer.scala
+++ b/core/src/main/scala/eu/nomad_lab/normalize/CalculationInfoNormalizer.scala
@@ -255,7 +255,7 @@ object CalculationInfoNormalizer extends NormalizerGenerator with StrictLogging
backend.addValue("calculation_uploader_name", jn.JString(uploader))
backend.addValue("calculation_upload_date", jn.JInt(uploadDate))
case None =>
- logger.warn(s"could not find pid for $calculation in ${CalculationInfoNormalizer.calcGidToPidMap(calculation.archive.archiveGid)}")
+ logger.warn(s"could not find pid for $calculation")
()
}
backend.closeSection("section_calculation_info", cId)
@@ -270,9 +270,12 @@ object CalculationInfoNormalizer extends NormalizerGenerator with StrictLogging
cInfo match {
case Some(RepoCalcInfo(pid, uploaders, uploadDate)) =>
backend.addValue("calculation_pid", jn.JString(pid))
- for (uploader <- uploaders)
- backend.addValue("calculation_uploader_name", jn.JString(uploader))
- backend.addValue("calculation_upload_date", jn.JInt(uploadDate))
+ if (cInfoTable.subValueTable("calculation_uploader_name").isEmpty) {
+ for (uploader <- uploaders)
+ backend.addValue("calculation_uploader_name", jn.JString(uploader))
+ }
+ if (cInfoTable.subValueTable("calculation_upload_date").isEmpty)
+ backend.addValue("calculation_upload_date", jn.JInt(uploadDate))
case None => ()
}
} finally {
--
GitLab