Added protection for empty records (individual, notes and multimedia)…

… in files from other programs (fix #605)
Serg-Norseman · Nov 24, 2024 · d3ea54b · d3ea54b
1 parent 1e07638
commit d3ea54b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Added protection for empty records (individual, notes and multimedia) in files from other programs.
             <li>Added option in tree diagrams - use additional dates (baptism, burial) if the main ones (births, deaths) are missing.
             <li>Added options in tree diagrams: text paddings, date designations and mourning edges.
             <li>Added text effect options in tree diagrams (GKv2 only).

diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>??.??.2024 [v2.32.0 &amp; v3.8.0]</b><ul>
+            <li>Добавлена защита пустых записей (персональных, заметок и мультимедиа) в файлах из сторонних программ.
             <li>Добавлена опция в диаграммах деревьев - использовать дополнительные даты (крещения и похорон), если отсутствуют основные (рождения, смерти).
             <li>Добавлены опции в диаграммах деревьев: отступа текста, обозначений дат и траурных рамок.
             <li>Добавлены опции эффектов текста в диаграммах деревьев (только GKv2).

diff --git a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMChecker.cs b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMChecker.cs
@@ -32,6 +32,8 @@ namespace GDModel.Providers.GEDCOM
     /// </summary>
     public class GEDCOMChecker
     {
+        private const string EmptyRecordContent = "---";
+
         private readonly IBaseContext fBaseContext;
         private readonly GEDCOMFormat fFormat;
         private readonly IProgressController fProgress;
@@ -291,6 +293,14 @@ private void CheckIndividualRecord(GDMIndividualRecord iRec)
                     iRec.DeleteTag("_FSFTID");
                 }
             }
+
+            // Empty records in files from other programs
+            if (iRec.PersonalNames.Count == 0) {
+                var name = new GDMPersonalName();
+                // when saving protection from skipping
+                name.Given = EmptyRecordContent;
+                iRec.PersonalNames.Add(name);
+            }
         }
 
         private void CheckChildLink(GDMFamilyRecord fam, int index)
@@ -393,6 +403,23 @@ private void CheckMultimediaRecord(GDMMultimediaRecord mmRec, int fileVer)
                     }
                 }
             }
+
+            // Empty records in files from other programs
+            if (mmRec.FileReferences.Count == 0) {
+                var fileRef = new GDMFileReferenceWithTitle();
+                // when saving protection from skipping
+                fileRef.Title = EmptyRecordContent;
+                mmRec.FileReferences.Add(fileRef);
+            }
+        }
+
+        private void CheckNoteRecord(GDMNoteRecord noteRec, int fileVer)
+        {
+            // Empty records in files from other programs
+            if (noteRec.Lines.Count == 0) {
+                // when saving protection from skipping
+                noteRec.Lines.Text = EmptyRecordContent;
+            }
         }
 
         private void CheckRecord(GDMRecord rec, int fileVer)
@@ -429,6 +456,10 @@ private void CheckRecord(GDMRecord rec, int fileVer)
                 case GDMRecordType.rtMultimedia:
                     CheckMultimediaRecord(rec as GDMMultimediaRecord, fileVer);
                     break;
+
+                case GDMRecordType.rtNote:
+                    CheckNoteRecord(rec as GDMNoteRecord, fileVer);
+                    break;
             }
         }
 

diff --git a/projects/GKCore/GKCore/Lists/MultimediaListModel.cs b/projects/GKCore/GKCore/Lists/MultimediaListModel.cs
@@ -81,10 +81,6 @@ public override void Fetch(GDMMultimediaRecord aRec)
 
         protected override object GetColumnValueEx(int colType, int colSubtype, bool isVisible)
         {
-            if (fFileRef == null) {
-                return null;
-            }
-
             object result = null;
             switch ((ColumnType)colType) {
                 case ColumnType.ctXRefNum: