Identifying differences between records, structures, and tags using H…

…ashCode (#583)
Serg-Norseman · Jul 2, 2024 · aa0352f · aa0352f
1 parent bd3a87f
commit aa0352f
Show file tree

Hide file tree

Showing 58 changed files with 617 additions and 49 deletions.
diff --git a/projects/GKCore/GDModel/GDMAddress.cs b/projects/GKCore/GDModel/GDMAddress.cs
@@ -240,5 +240,25 @@ public void SetAddressArray(string[] value)
             fLines.Clear();
             fLines.AddRange(value);
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddHash(fLines.GetHashCode());
+
+            hashCode.AddObj(fAddressLine1);
+            hashCode.AddObj(fAddressLine2);
+            hashCode.AddObj(fAddressLine3);
+            hashCode.AddObj(fAddressCity);
+            hashCode.AddObj(fAddressState);
+            hashCode.AddObj(fAddressPostalCode);
+            hashCode.AddObj(fAddressCountry);
+
+            ProcessHashes(ref hashCode, fPhoneList);
+            ProcessHashes(ref hashCode, fEmailList);
+            ProcessHashes(ref hashCode, fFaxList);
+            ProcessHashes(ref hashCode, fWWWList);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMAssociation.cs b/projects/GKCore/GDModel/GDMAssociation.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2021 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -102,5 +102,14 @@ public override void Assign(GDMTag source)
             fRelation = sourceObj.fRelation;
             if (sourceObj.fSourceCitations != null) AssignList(sourceObj.fSourceCitations, SourceCitations);
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fRelation);
+
+            ProcessHashes(ref hashCode, fSourceCitations);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMChangeDate.cs b/projects/GKCore/GDModel/GDMChangeDate.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2019 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -71,5 +71,12 @@ public override bool IsEmpty()
         {
             return base.IsEmpty() && (fChangeDateTime.Equals(ZeroDateTime));
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddVal(fChangeDateTime);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMChildToFamilyLink.cs b/projects/GKCore/GDModel/GDMChildToFamilyLink.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -82,5 +82,13 @@ public override void Assign(GDMTag source)
             fChildLinkageStatus = srcCFL.fChildLinkageStatus;
             fPedigreeLinkageType = srcCFL.fPedigreeLinkageType;
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddVal(fChildLinkageStatus);
+            hashCode.AddVal(fPedigreeLinkageType);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMCommunicationRecord.cs b/projects/GKCore/GDModel/GDMCommunicationRecord.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -155,5 +155,16 @@ public override void ReplaceXRefs(GDMXRefReplacer map)
             base.ReplaceXRefs(map);
             fCorresponder.ReplaceXRefs(map);
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fCommName);
+            hashCode.AddVal(fCommunicationType);
+            hashCode.AddObj(fDate);
+            hashCode.AddVal(fCommDirection);
+            hashCode.AddObj(fCorresponder);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMCustomEvent.cs b/projects/GKCore/GDModel/GDMCustomEvent.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".
  *
@@ -296,5 +296,22 @@ public int GetChronologicalYear()
         {
             return Date.GetChronologicalYear();
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fAddress);
+            hashCode.AddObj(fAgency);
+            hashCode.AddObj(fCause);
+            hashCode.AddObj(fClassification);
+            hashCode.AddObj(fDate);
+            hashCode.AddObj(fPlace);
+            hashCode.AddObj(fReligiousAffilation);
+            hashCode.AddVal(fRestriction);
+            ProcessHashes(ref hashCode, fNotes);
+            ProcessHashes(ref hashCode, fSourceCitations);
+            ProcessHashes(ref hashCode, fMultimediaLinks);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMCutoutPosition.cs b/projects/GKCore/GDModel/GDMCutoutPosition.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2021 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -126,5 +126,15 @@ internal void SetRawData(int x1, int y1, int x2, int y2)
             fX2 = x2;
             fY2 = y2;
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddVal(fX1);
+            hashCode.AddVal(fY1);
+            hashCode.AddVal(fX2);
+            hashCode.AddVal(fY2);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMDate.cs b/projects/GKCore/GDModel/GDMDate.cs
@@ -698,5 +698,18 @@ private static byte DaysInMonth(bool yearBC, short year, byte month, GDMCalendar
 
             return (byte)DateTime.DaysInMonth(year, month);
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddVal(fApproximated);
+            hashCode.AddVal(fCalendar);
+            hashCode.AddVal(fDay);
+            hashCode.AddVal(fMonth);
+            hashCode.AddVal(fYear);
+            hashCode.AddVal(fYearBC);
+            hashCode.AddObj(fYearModifier);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMDateInterpreted.cs b/projects/GKCore/GDModel/GDMDateInterpreted.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2019 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -18,6 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using System;
 using GDModel.Providers.GEDCOM;
 
 namespace GDModel
@@ -75,5 +76,12 @@ public override string ParseString(string strValue)
             }
             return result;
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fDatePhrase);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMDatePeriod.cs b/projects/GKCore/GDModel/GDMDatePeriod.cs
@@ -185,5 +185,13 @@ public override void GetDateRange(out GDMDate dateStart, out GDMDate dateEnd)
             dateStart = fDateFrom;
             dateEnd = fDateTo;
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fDateFrom);
+            hashCode.AddObj(fDateTo);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMDateRange.cs b/projects/GKCore/GDModel/GDMDateRange.cs
@@ -197,5 +197,13 @@ public override void GetDateRange(out GDMDate dateStart, out GDMDate dateEnd)
             dateStart = fDateAfter;
             dateEnd = fDateBefore;
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fDateAfter);
+            hashCode.AddObj(fDateBefore);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMDateValue.cs b/projects/GKCore/GDModel/GDMDateValue.cs
@@ -179,5 +179,12 @@ public override void GetDateRange(out GDMDate dateStart, out GDMDate dateEnd)
                 fValue.GetDateRange(out dateStart, out dateEnd);
             }
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fValue);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMFamilyEvent.cs b/projects/GKCore/GDModel/GDMFamilyEvent.cs
@@ -18,6 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using System;
+
 namespace GDModel
 {
     public sealed class GDMFamilyEvent : GDMCustomEvent
@@ -30,5 +32,10 @@ public GDMFamilyEvent(int tagId, string tagValue)
         {
             SetNameValue(tagId, tagValue);
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMFamilyRecord.cs b/projects/GKCore/GDModel/GDMFamilyRecord.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -305,5 +305,15 @@ public bool HasChild(GDMIndividualRecord child)
         {
             return IndexOfChild(child) >= 0;
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            ProcessHashes(ref hashCode, fChildren);
+            hashCode.AddObj(fHusband);
+            hashCode.AddObj(fWife);
+            hashCode.AddVal(fStatus);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMFileReference.cs b/projects/GKCore/GDModel/GDMFileReference.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2021 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -178,5 +178,13 @@ public static GDMMultimediaFormat RecognizeFormat(string fileName)
             var strFmt = GetMultimediaExt(fileName);
             return string.IsNullOrEmpty(strFmt) ? GDMMultimediaFormat.mfUnknown : GEDCOMUtils.GetMultimediaFormatVal(strFmt);
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fMultimediaFormat);
+            hashCode.AddVal(fMediaType);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMFileReferenceWithTitle.cs b/projects/GKCore/GDModel/GDMFileReferenceWithTitle.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2019 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -54,5 +54,12 @@ public override bool IsEmpty()
         {
             return base.IsEmpty() && string.IsNullOrEmpty(fTitle);
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fTitle);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMGroupRecord.cs b/projects/GKCore/GDModel/GDMGroupRecord.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2022 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -160,5 +160,13 @@ public override void MoveTo(GDMRecord targetRecord)
                 targetGroup.Members.Add(obj);
             }
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            hashCode.AddObj(fGroupName);
+            ProcessHashes(ref hashCode, fMembers);
+        }
     }
 }
diff --git a/projects/GKCore/GDModel/GDMIndividualAttribute.cs b/projects/GKCore/GDModel/GDMIndividualAttribute.cs
@@ -18,6 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using System;
 using GDModel.Providers.GEDCOM;
 
 namespace GDModel
@@ -39,5 +40,12 @@ public GDMIndividualAttribute(int tagId, string tagValue)
         {
             SetNameValue(tagId, tagValue);
         }
+
+        protected override void ProcessHashes(ref HashCode hashCode)
+        {
+            base.ProcessHashes(ref hashCode);
+
+            //hashCode.AddObj(PhysicalDescription); <- inner Tags
+        }
     }
 }