Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/EncDotNet.Iso8211/Iso8211FieldReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ private T ConvertValue<T>(ParsedSubfield parsed, Iso8211SubfieldDefinition subfi
/// </summary>
private object ConvertCharacterData<T>(ReadOnlySpan<byte> data)
{
var encoding = _lexicalLevel >= 2 ? Encoding.Unicode : Encoding.ASCII;
var encoding = _lexicalLevel >= 2 ? Encoding.Unicode : Encoding.UTF8;
var str = encoding.GetString(data).TrimEnd('\x1F', '\x1E', '\0', ' ');

if (typeof(T) == typeof(string))
Expand Down
48 changes: 48 additions & 0 deletions tests/EndDotNet.UnitTests/Iso8211FieldReaderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,54 @@ public void GetSubfield_FixedWidthString_ReturnsCorrectValue()
Assert.Equal("TESTFILE", value);
}

[Fact]
public void GetSubfield_AsciiString_DecodesCorrectlyAtLexicalLevel0()
{
// Arrange: pure ASCII text at lexical level 0
var fieldDef = CreateFieldDefinition("TEST",
("NAME", Iso8211SubfieldFormatType.CharacterData, 0, false));
var data = Encoding.ASCII.GetBytes("Halifax\u001E");
var reader = new Iso8211FieldReader(fieldDef, data, lexicalLevel: 0);

// Act
var value = reader.GetSubfield<string>("NAME");

// Assert
Assert.Equal("Halifax", value);
}

[Fact]
public void GetSubfield_Utf8String_DecodesAccentedCharactersAtLexicalLevel0()
{
// Arrange: UTF-8 encoded "Île d'Orléans" at lexical level 0
var fieldDef = CreateFieldDefinition("TEST",
("NAME", Iso8211SubfieldFormatType.CharacterData, 0, false));
byte[] utf8Bytes = [0xC3, 0x8E, 0x6C, 0x65, 0x20, 0x64, 0x27, 0x4F, 0x72, 0x6C, 0xC3, 0xA9, 0x61, 0x6E, 0x73, 0x1E];
var reader = new Iso8211FieldReader(fieldDef, utf8Bytes, lexicalLevel: 0);

// Act
var value = reader.GetSubfield<string>("NAME");

// Assert
Assert.Equal("Île d'Orléans", value);
}

[Fact]
public void GetSubfield_Utf8String_DecodesAccentedCharactersAtLexicalLevel1()
{
// Arrange: UTF-8 encoded "Île d'Orléans" at lexical level 1
var fieldDef = CreateFieldDefinition("TEST",
("NAME", Iso8211SubfieldFormatType.CharacterData, 0, false));
byte[] utf8Bytes = [0xC3, 0x8E, 0x6C, 0x65, 0x20, 0x64, 0x27, 0x4F, 0x72, 0x6C, 0xC3, 0xA9, 0x61, 0x6E, 0x73, 0x1E];
var reader = new Iso8211FieldReader(fieldDef, utf8Bytes, lexicalLevel: 1);

// Act
var value = reader.GetSubfield<string>("NAME");

// Assert
Assert.Equal("Île d'Orléans", value);
}

[Fact]
public void GetSubfield_VariableLengthString_StopsAtUnitTerminator()
{
Expand Down
Loading