Make date comparison more flexible with different formats

francoisforster · Dec 5, 2021 · 5aa1b43 · 5aa1b43
1 parent 7318dfd
commit 5aa1b43
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/gedcom-cleanup.jar b/gedcom-cleanup.jar
diff --git a/gedcom-compare.jar b/gedcom-compare.jar
diff --git a/src/Event.kt b/src/Event.kt
@@ -1,3 +1,18 @@
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeFormatterBuilder
+import java.time.format.DateTimeParseException
+
+private val shortFormatter = getFormatter("d MMM yyyy")
+private val longFormatter = getFormatter("d MMMM yyyy")
+
+fun getFormatter(pattern: String): DateTimeFormatter {
+    val builder = DateTimeFormatterBuilder()
+    builder.parseCaseInsensitive()
+    builder.appendPattern(pattern)
+    return builder.toFormatter()
+}
+
 data class Event(
     val parentReferenceId: String?,
     val record: Record,
@@ -23,6 +38,25 @@ data class Event(
         if (other?.place?.contains(',') == true) {
             otherShortPlace = other.place.substring(0, other.place.indexOf(","))
         }
-        return date == other?.date && shortPlace == otherShortPlace
+        return datesMatch(date, other?.date) && shortPlace == otherShortPlace
+    }
+
+    private fun datesMatch(date: String?, otherDate: String?): Boolean {
+        if (date == null || otherDate == null) {
+            return date == otherDate
+        }
+        return try {
+            parseDate(date) == parseDate(otherDate)
+        } catch (e: DateTimeParseException) {
+            date == otherDate
+        }
+    }
+
+    private fun parseDate(date: String): LocalDate {
+        return try {
+            LocalDate.parse(date, shortFormatter)
+        } catch (e: DateTimeParseException) {
+            LocalDate.parse(date, longFormatter)
+        }
     }
 }
diff --git a/src/GedcomCompare.kt b/src/GedcomCompare.kt
@@ -334,13 +334,13 @@ class GedcomCompare(
         if (leftFamily.getMarriage()?.matches(rightFamily.getMarriage()) == true) {
             result += 40
         }
-        var leftHusband = leftGedcom.getIndividual(leftFamily.getHusband())
-        var rightHusband = rightGedcom.getIndividual(rightFamily.getHusband())
+        val leftHusband = leftGedcom.getIndividual(leftFamily.getHusband())
+        val rightHusband = rightGedcom.getIndividual(rightFamily.getHusband())
         if (leftHusband != null && rightHusband != null) {
             result += matchIndividualScore(leftHusband, rightHusband)
         }
-        var leftWife = leftGedcom.getIndividual(leftFamily.getWife())
-        var rightWife = rightGedcom.getIndividual(rightFamily.getWife())
+        val leftWife = leftGedcom.getIndividual(leftFamily.getWife())
+        val rightWife = rightGedcom.getIndividual(rightFamily.getWife())
         if (leftWife != null && rightWife != null) {
             result += matchIndividualScore(leftWife, rightWife)
         }