Skip to content
Snippets Groups Projects
Commit 0832f655 authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Changed error message

parent bf1d0b71
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ trait MultiSampleQScript extends SummaryQScript { ...@@ -48,7 +48,7 @@ trait MultiSampleQScript extends SummaryQScript {
/** Adds the library jobs */ /** Adds the library jobs */
final def addAndTrackJobs(): Unit = { final def addAndTrackJobs(): Unit = {
if (nameRegex.findFirstIn(libId) == None) if (nameRegex.findFirstIn(libId) == None)
Logging.addError(s"Library '$libId' does not conform to '$nameRegex'") Logging.addError(s"Library '$libId' $nameError")
currentSample = Some(sampleId) currentSample = Some(sampleId)
currentLib = Some(libId) currentLib = Some(libId)
addJobs() addJobs()
...@@ -93,7 +93,7 @@ trait MultiSampleQScript extends SummaryQScript { ...@@ -93,7 +93,7 @@ trait MultiSampleQScript extends SummaryQScript {
/** Adds sample jobs */ /** Adds sample jobs */
final def addAndTrackJobs(): Unit = { final def addAndTrackJobs(): Unit = {
if (nameRegex.findFirstIn(sampleId) == None) if (nameRegex.findFirstIn(sampleId) == None)
Logging.addError(s"Sample '$sampleId' does not conform to '$nameRegex'") Logging.addError(s"Sample '$sampleId' $nameError")
currentSample = Some(sampleId) currentSample = Some(sampleId)
addJobs() addJobs()
qscript.addSummarizable(this, "pipeline", Some(sampleId)) qscript.addSummarizable(this, "pipeline", Some(sampleId))
...@@ -134,6 +134,10 @@ trait MultiSampleQScript extends SummaryQScript { ...@@ -134,6 +134,10 @@ trait MultiSampleQScript extends SummaryQScript {
protected def sampleIds: Set[String] = ConfigUtils.any2map(globalConfig.map("samples")).keySet protected def sampleIds: Set[String] = ConfigUtils.any2map(globalConfig.map("samples")).keySet
protected lazy val nameRegex = """^[a-zA-Z0-9][a-zA-Z0-9-_]+[a-zA-Z0-9]$""".r protected lazy val nameRegex = """^[a-zA-Z0-9][a-zA-Z0-9-_]+[a-zA-Z0-9]$""".r
protected lazy val nameError = " name invalid." +
"Name must have at least 3 characters," +
"must begin and end with an alphanumeric character, " +
"and must not have whitespace."
/** Runs addAndTrackJobs method for each sample */ /** Runs addAndTrackJobs method for each sample */
final def addSamplesJobs() { final def addSamplesJobs() {
......
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