Merge pull request #108 from valydia/bugfix_integrity_check

Bugfix integrity check

Author: LauraDamianTNA

README.md

@@ -38,7 +38,7 @@ If you wish to use the CSV Validator from your own Java project, we provide a na
 <dependency>
 	<groupId>uk.gov.nationalarchives</groupId>
     <artifactId>csv-validator-java-api</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
 </dependency>
 ```
 

csv-validator-core/pom.xml

@@ -150,7 +150,7 @@
             <version>1.2</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
+            <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>1.3.2</version>
         </dependency>

csv-validator-core/src/main/scala/uk/gov/nationalarchives/csv/validator/Util.scala

@@ -215,18 +215,9 @@ object Util {
     }
 
     private def contentDir(filepath: String, topLevelFolder: String): String = {
-      val dir = pathSubstitutions.collectFirst{
-        case (subFrom, subTo) if filepath.contains(subFrom) => FileSystem.file2PlatformIndependent(subTo)
-      }  getOrElse {
-        (filepath split topLevelFolder).head
-      }
-
-      val sep = "/"
-      val lastfilePath = dir.split(sep).last
-      if (lastfilePath.equals(topLevelFolder) || lastfilePath.equals(topLevelFolder + sep)) {
-        dir
-      } else
-        FileSystem.file2PlatformIndependent(dir + sep + topLevelFolder)
+      val dir = (substitutePath(filepath) split topLevelFolder).head
+       val sep = "/"
+      FileSystem.file2PlatformIndependent(dir + sep + topLevelFolder)
     }
 
     def jointPath: String = {

csv-validator-parent/pom.xml

@@ -75,7 +75,7 @@
         <scala.version>2.11</scala.version>
         <scala.lib.version>2.11.6</scala.lib.version>
         <scalaz.version>7.1.1</scalaz.version>
-        <java.version>1.6</java.version>
+        <java.version>1.7</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <contact.email>[email protected]</contact.email>
     </properties>