From c59e87e34c41a10f7223b838fa187320381a0c26 Mon Sep 17 00:00:00 2001 From: "Sergey V. Zhdanovskih" Date: Mon, 27 May 2024 00:14:34 +0300 Subject: [PATCH] Temp fix for user defined name types (fix #550) --- projects/GKCore/GDModel/GDMPersonalName.cs | 1 + projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs | 2 +- projects/GKCore/GKCore/GKData.cs | 1 + projects/GKTests/GDModel/Providers/GEDCOM/GEDCOMUtilsTests.cs | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/GKCore/GDModel/GDMPersonalName.cs b/projects/GKCore/GDModel/GDMPersonalName.cs index 6dfc894d8..fc0a3c1d4 100644 --- a/projects/GKCore/GDModel/GDMPersonalName.cs +++ b/projects/GKCore/GDModel/GDMPersonalName.cs @@ -26,6 +26,7 @@ namespace GDModel public enum GDMNameType { ntNone, + ntAdoption, // FIXME: user defined name types (gh#550) ntAka, ntBirth, ntImmigrant, diff --git a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs index 5136fcecb..b2e4238fe 100644 --- a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs +++ b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMUtils.cs @@ -1337,7 +1337,7 @@ public static string GetLanguageStr(GDMLanguageID value) public static readonly string[] NameTypes = new string[] { - "", "aka", "birth", "immigrant", "maiden", "married" }; + "", "adoption", "aka", "birth", "immigrant", "maiden", "married" }; public static GDMNameType GetNameTypeVal(string str) { diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs index 52d320e07..f7f7d6de4 100644 --- a/projects/GKCore/GKCore/GKData.cs +++ b/projects/GKCore/GKCore/GKData.cs @@ -535,6 +535,7 @@ static GKData() NameTypes = new LSID[] { LSID.DefaultValue, + LSID.Adoption, // FIXME: user defined name types (gh#550) LSID.NTAka, LSID.NTBirth, LSID.NTImmigrant, diff --git a/projects/GKTests/GDModel/Providers/GEDCOM/GEDCOMUtilsTests.cs b/projects/GKTests/GDModel/Providers/GEDCOM/GEDCOMUtilsTests.cs index ec2d6a784..4ab976207 100644 --- a/projects/GKTests/GDModel/Providers/GEDCOM/GEDCOMUtilsTests.cs +++ b/projects/GKTests/GDModel/Providers/GEDCOM/GEDCOMUtilsTests.cs @@ -196,6 +196,7 @@ public void Test_GEDCOMEnumNT() { Assert.AreEqual(GDMNameType.ntNone, GEDCOMUtils.GetNameTypeVal("unk")); Assert.AreEqual(GDMNameType.ntNone, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntNone))); + Assert.AreEqual(GDMNameType.ntAdoption, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntAdoption))); Assert.AreEqual(GDMNameType.ntAka, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntAka))); Assert.AreEqual(GDMNameType.ntBirth, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntBirth))); Assert.AreEqual(GDMNameType.ntImmigrant, GEDCOMUtils.GetNameTypeVal(GEDCOMUtils.GetNameTypeStr(GDMNameType.ntImmigrant)));