Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs =================================================================== diff -u -r968645e02cdc2c21c899fa8099589c779138be54 -rcd17802422ec70791daa96e1f536bf505ecfe954 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs (.../CharacteristicPointsCsvReader.cs) (revision 968645e02cdc2c21c899fa8099589c779138be54) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs (.../CharacteristicPointsCsvReader.cs) (revision cd17802422ec70791daa96e1f536bf505ecfe954) @@ -244,6 +244,8 @@ { columnsInFile.Clear(); + lineNumber = 1; + string[] tokenizedHeader = TokenizeString(header.ToLowerInvariant().Replace(' ', '_')); if (!DetermineIdColumn(tokenizedHeader)) Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r7f7c1f610ed7b45162ff58b91a4ee75b68e02605 -rcd17802422ec70791daa96e1f536bf505ecfe954 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7f7c1f610ed7b45162ff58b91a4ee75b68e02605) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cd17802422ec70791daa96e1f536bf505ecfe954) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -79,7 +79,7 @@ } /// - /// Looks up a localized string similar to {0} + /// Looks up a localized string similar to {0} ///Het bestand wordt overgeslagen.. /// public static string PipingSoilProfilesImporter_CriticalErrorMessage_0_File_Skipped { @@ -116,7 +116,7 @@ } /// - /// Looks up a localized string similar to {0} + /// Looks up a localized string similar to {0} ///Deze ondergrondschematisering wordt overgeslagen.. /// public static string PipingSoilProfilesImporter_ReadSoilProfiles_ParseErrorMessage_0_SoilProfile_skipped { @@ -186,7 +186,7 @@ } /// - /// Looks up a localized string similar to {0} + /// Looks up a localized string similar to {0} ///Het bestand wordt overgeslagen.. /// public static string PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped { @@ -233,7 +233,7 @@ } /// - /// Looks up a localized string similar to {0} + /// Looks up a localized string similar to {0} ///Deze locatie met karakteristieke punten wordt overgeslagen.. /// public static string PipingSurfaceLinesCsvImporter_ReadCharacteristicPoints_ParseErrorMessage_0_CharacteristicPoints_skipped { @@ -254,7 +254,7 @@ } /// - /// Looks up a localized string similar to {0} + /// Looks up a localized string similar to {0} ///Deze profielmeting wordt overgeslagen.. /// public static string PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseErrorMessage_0_SurfaceLine_skipped { Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx =================================================================== diff -u -r7f7c1f610ed7b45162ff58b91a4ee75b68e02605 -rcd17802422ec70791daa96e1f536bf505ecfe954 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 7f7c1f610ed7b45162ff58b91a4ee75b68e02605) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision cd17802422ec70791daa96e1f536bf505ecfe954) @@ -133,11 +133,11 @@ Inlezen '{0}' - {0} + {0} Het bestand wordt overgeslagen. - {0} + {0} Deze profielmeting wordt overgeslagen. @@ -150,11 +150,11 @@ Inlezen van de D-Soil Model database - {0} + {0} Het bestand wordt overgeslagen. - {0} + {0} Deze ondergrondschematisering wordt overgeslagen. @@ -167,7 +167,7 @@ Geen karakteristieke punten-bestand gevonden naast het profielmetingenbestand. (Verwacht bestand: {0}) - {0} + {0} Deze locatie met karakteristieke punten wordt overgeslagen. Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SurfaceLines/CharacteristicPointsCsvReaderTest.cs =================================================================== diff -u -r9eb91cfa000697ddfdeace89aa8f1e959fc1f7f9 -rcd17802422ec70791daa96e1f536bf505ecfe954 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SurfaceLines/CharacteristicPointsCsvReaderTest.cs (.../CharacteristicPointsCsvReaderTest.cs) (revision 9eb91cfa000697ddfdeace89aa8f1e959fc1f7f9) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SurfaceLines/CharacteristicPointsCsvReaderTest.cs (.../CharacteristicPointsCsvReaderTest.cs) (revision cd17802422ec70791daa96e1f536bf505ecfe954) @@ -506,7 +506,7 @@ // Assert var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 0").Build(string.Format(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_separator_0_, ';')); + var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(string.Format(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_separator_0_, ';')); Assert.AreEqual(expectedMessage, exception.Message); } }