Merge pull request #131 from rhubner/bug-129

LauraDamianTNA · web-flow · commit 300ef07d2064 · 2016-11-09T11:39:14.000Z
[bugfix] Fix bug #129, when foldername contains "content".
diff --git a/csv-validator-core/src/main/scala/uk/gov/nationalarchives/csv/validator/Util.scala b/csv-validator-core/src/main/scala/uk/gov/nationalarchives/csv/validator/Util.scala
@@ -218,12 +218,8 @@ object Util {
     }
 
     private def contentDir(filepath: String, topLevelFolder: String): String = {
-      val list = (substitutePath(filepath) split topLevelFolder).toIterator.toList
-      val pathList = if (list.length > 1) list.dropRight(1) else list
-        val dir = pathList.tail.foldLeft(pathList.head){ case (acc, elem) =>
-          acc + topLevelFolder + elem
-        }
-      FileSystem.file2PlatformIndependent(dir +  topLevelFolder)
+      val substPath = substitutePath(filepath).split("/").toSeq.reverse.dropWhile(!_.equals(topLevelFolder)).reverse.mkString("/")
+      FileSystem.file2PlatformIndependent(substPath)
     }
 
     def jointPath: String = {

Original file line number	Diff line number	Diff line change
`@@ -218,12 +218,8 @@ object Util {`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`private def contentDir(filepath: String, topLevelFolder: String): String = {`
`221`		`- val list = (substitutePath(filepath) split topLevelFolder).toIterator.toList`
`222`		`- val pathList = if (list.length > 1) list.dropRight(1) else list`
`223`		`- val dir = pathList.tail.foldLeft(pathList.head){ case (acc, elem) =>`
`224`		`- acc + topLevelFolder + elem`
`225`		`- }`
`226`		`- FileSystem.file2PlatformIndependent(dir + topLevelFolder)`
	`221`	`+ val substPath = substitutePath(filepath).split("/").toSeq.reverse.dropWhile(!_.equals(topLevelFolder)).reverse.mkString("/")`
	`222`	`+ FileSystem.file2PlatformIndependent(substPath)`
`227`	`223`	`}`
`228`	`224`
`229`	`225`	`def jointPath: String = {`