Transfer of location integrity control

Serg-Norseman · Apr 14, 2024 · 95354fe · 95354fe
1 parent 6e4d010
commit 95354fe
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 4 deletions.
diff --git a/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMChecker.cs b/projects/GKCore/GDModel/Providers/GEDCOM/GEDCOMChecker.cs
@@ -182,9 +182,9 @@ private void CheckEventPlace(GDMPlace place, GDMCustomEvent evt)
                 placeLocation.XRef = "";
             }
 
-            if (place.StringValue != "" && locRec != null) {
+            /*if (place.StringValue != "" && locRec != null) {
                 place.StringValue = GKUtils.GetLocationNameExt(locRec, evt.Date.Value);
-            }
+            }*/
 
             CheckTagWithNotes(place);
         }
@@ -550,5 +550,52 @@ public static bool CheckGEDCOMFormat(IBaseContext baseContext, IProgressControll
             var instance = new GEDCOMChecker(baseContext, pc);
             return instance.CheckFormat();
         }
+
+
+        public static void SyncTreeLocations(IBaseContext baseContext, IProgressController pc)
+        {
+            if (baseContext == null)
+                throw new ArgumentNullException("baseContext");
+
+            if (pc == null)
+                throw new ArgumentNullException("pc");
+
+            try {
+                var tree = baseContext.Tree;
+                pc.Begin(LangMan.LS(LSID.FormatCheck), 100);
+
+                try {
+                    int progress = 0;
+                    int num = tree.RecordsCount;
+                    for (int i = 0; i < num; i++) {
+                        GDMRecord rec = tree[i];
+                        if (rec.RecordType == GDMRecordType.rtIndividual || rec.RecordType == GDMRecordType.rtFamily) {
+                            var rwe = rec as GDMRecordWithEvents;
+                            if (rwe.HasEvents) {
+                                for (int k = 0, num2 = rwe.Events.Count; k < num2; k++) {
+                                    GDMCustomEvent evt = rwe.Events[k];
+                                    if (!evt.HasPlace) continue;
+
+                                    GDMLocationRecord locRec = tree.GetPtrValue<GDMLocationRecord>(evt.Place.Location);
+                                    if (locRec != null) {
+                                        evt.Place.StringValue = GKUtils.GetLocationNameExt(locRec, evt.Date.Value);
+                                    }
+                                }
+                            }
+                        }
+
+                        int newProgress = (int)Math.Min(100, ((i + 1) * 100.0f) / num);
+                        if (progress != newProgress) {
+                            progress = newProgress;
+                            pc.StepTo(progress);
+                        }
+                    }
+                } finally {
+                    pc.End();
+                }
+            } catch (Exception ex) {
+                Logger.WriteError("GEDCOMChecker.SyncTreeLocations()", ex);
+            }
+        }
     }
 }
diff --git a/projects/GKCore/GKCore/Controllers/PlacesManagerController.cs b/projects/GKCore/GKCore/Controllers/PlacesManagerController.cs
@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 using BSLib;
 using GDModel;
+using GDModel.Providers.GEDCOM;
 using GKCore.Design;
 using GKCore.Design.Controls;
 using GKCore.Design.Views;
@@ -46,6 +47,13 @@ public override void UpdateView()
         {
         }
 
+        public void SyncAll()
+        {
+            AppHost.Instance.ExecuteWork((controller) => {
+                GEDCOMChecker.SyncTreeLocations(fBase.Context, controller);
+            });
+        }
+
         public void Clear()
         {
             TreeTools.SearchPlaces_Clear(fPlaces);

diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/TTPlacesManagerDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/TTPlacesManagerDlg.Designer.cs
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/TTPlacesManagerDlg.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/TTPlacesManagerDlg.cs
@@ -77,6 +77,11 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
 
+        private void Form_Load(object sender, EventArgs e)
+        {
+            fController.SyncAll();
+        }
+
         private void miDetails_Click(object sender, EventArgs e)
         {
             fController.ShowDetails();

diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/TTPlacesManagerDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/TTPlacesManagerDlg.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -87,6 +87,11 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
 
+        private void Form_Load(object sender, EventArgs e)
+        {
+            fController.SyncAll();
+        }
+
         private void miDetails_Click(object sender, EventArgs e)
         {
             fController.ShowDetails();

diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/TTPlacesManagerDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/TTPlacesManagerDlg.xeto
@@ -2,7 +2,7 @@
 <Dialog xmlns="http://schema.picoe.ca/eto.forms" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:forms="clr-namespace:GKUI.Forms" xmlns:comcom="clr-namespace:GKUI.Components;assembly=GKComponents"
   x:Class="GKUI.Forms.TTPlacesManagerDlg"
-  AbortButton="{x:Reference btnClose}">
+  AbortButton="{x:Reference btnClose}" Load="Form_Load">
 
   <TableLayout Style="paddedTable8">