Support quoted semicolons in csv field values

And unskip corresponding unit test
arkivverket · Feb 16, 2018 · 49677fe · 49677fe
1 parent 313a4f4
commit 49677fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Arkivverket.Arkade.Test/Core/Addml/DelimiterFileFormatReaderTest.cs b/src/Arkivverket.Arkade.Test/Core/Addml/DelimiterFileFormatReaderTest.cs
@@ -106,7 +106,7 @@ private void RecordShouldMatch(Record record, int fieldIndex, string name, strin
             record.Fields[fieldIndex].Value.Should().Be(value);
         } 
 
-        [Fact(Skip = "Test is for a not yet implemented feature")]
+        [Fact]
         public void SemicolonsWithinQuotesAreNotInterpretedAsFieldDelimiters()
         {
             AddmlFlatFileDefinition addmlFlatFileDefinition = new AddmlFlatFileDefinitionBuilder()

diff --git a/src/Arkivverket.Arkade/Core/Addml/DelimiterFileFormatReader.cs b/src/Arkivverket.Arkade/Core/Addml/DelimiterFileFormatReader.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 using Arkivverket.Arkade.Core.Addml.Definitions;
 
 namespace Arkivverket.Arkade.Core.Addml
@@ -52,7 +53,7 @@ private Record GetCurrentRecord()
 
             string currentLine = _lines.Current;
 
-            string[] strings = currentLine.Split(new[] {_fieldDelimiter}, StringSplitOptions.None);
+            string[] strings = Regex.Split(currentLine, $@"{_fieldDelimiter}(?=(?:[^""]*""[^""]*"")*[^""]*$)");
 
             string recordIdentifier = null;
             if (_recordIdentifierPosition.HasValue)