Commit fdf13694 authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Added manual path set to config

parent 92985895
......@@ -52,7 +52,7 @@ trait Configurable extends ImplicitConversions {
* @param submodule
* @return
*/
def path(sample: String = null, library: String = null, submodule: String = null) = {
def getConfigPath(sample: String = null, library: String = null, submodule: String = null) = {
(if (sample != null) "samples" :: sample :: Nil else Nil) :::
(if (library != null) "libraries" :: library :: Nil else Nil) :::
(if (submodule != null) configPath ::: configName :: Nil else configPath)
......@@ -91,11 +91,12 @@ trait Configurable extends ImplicitConversions {
submodule: String = null,
freeVar: Boolean = true,
sample: String = null,
library: String = null): ConfigValue = {
library: String = null,
path: List[String] = null): ConfigValue = {
val s = if (sample != null || defaultSample.isEmpty) sample else defaultSample.get
val l = if (library != null || defaultLibrary.isEmpty) library else defaultLibrary.get
val m = if (submodule != null) submodule else configName
val p = path(s, l, submodule)
val p = if (path == null) getConfigPath(s, l, submodule) else path
val d = {
val value = Config.getValueFromMap(defaults.toMap, ConfigValueIndex(m, p, key, freeVar))
if (value.isDefined) value.get.value else default
......@@ -117,11 +118,12 @@ trait Configurable extends ImplicitConversions {
submodule: String = null,
freeVar: Boolean = true,
sample: String = null,
library: String = null) = {
library: String = null,
path: List[String] = null) = {
val s = if (sample != null || defaultSample.isEmpty) sample else defaultSample.get
val l = if (library != null || defaultLibrary.isEmpty) library else defaultLibrary.get
val m = if (submodule != null) submodule else configName
val p = path(s, l, submodule)
val p = if (path == null) getConfigPath(s, l, submodule) else path
globalConfig.contains(m, p, key, freeVar) || !(Config.getValueFromMap(defaults.toMap, ConfigValueIndex(m, p, key, freeVar)) == None)
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment