From ae825ae80ac3b83eae56a30caa437ced327340c1 Mon Sep 17 00:00:00 2001 From: Gulum Date: Sat, 6 Jun 2026 11:59:10 +0200 Subject: [PATCH] =?UTF-8?q?data(import):=20D5=20Flint=20resolved=20(died?= =?UTF-8?q?=2010.05.2021,=202022=20was=20typo)=20+=20decisions=20schema=20?= =?UTF-8?q?gains=20dateOfDeath=20=E2=80=94=20Julian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HUMANQUESTION.md | 2 +- tools/import/conflict-decisions.json | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/HUMANQUESTION.md b/HUMANQUESTION.md index df3647a..43205d6 100644 --- a/HUMANQUESTION.md +++ b/HUMANQUESTION.md @@ -112,7 +112,7 @@ Bitte je Tier sagen, **welcher Wert stimmt** (die Quellen widersprechen sich bei ### D5 · **Sterbedatum** widersprüchlich | Tier | Problem | |---|---| -| Flint v.d. Kleinen Chaoten (*23.12.2017) | Tod 10.05.**2021** vs. 10.05.**2022** (Jahr-Tippfehler?) | +| ~~Flint v.d. Kleinen Chaoten (*23.12.2017)~~ | ✅ **Tod 10.05.2021** (2022 war Tippfehler) — Julian 2026-06-06 | | Hanami v.d. Kleinen Chaoten (*10.09.2015) | Tod 12.12.2019 vs. 14.01.2020 | | Molly of Black Forest (*13.09.2021) | Tod **03.05.2021 — VOR der Geburt** → klarer Datenfehler, bitte korrigieren | diff --git a/tools/import/conflict-decisions.json b/tools/import/conflict-decisions.json index 5ca4b12..a554cbd 100644 --- a/tools/import/conflict-decisions.json +++ b/tools/import/conflict-decisions.json @@ -1,5 +1,5 @@ { - "_doc": "Human conflict resolutions for the import quarantine (HUMANQUESTION section D / C6). The importer consumes this to UN-QUARANTINE an animal: for a matching (name + dob) it accepts `genotype` (and/or `farbschlag`) as authoritative and skips the conflict. Key match = normalize(name) + dob, same identity as dedup. Maintained by god (Michael) as Julian/his wife answer the D-conflicts; originals (xlsx) stay read-only.", + "_doc": "Human conflict resolutions for the import quarantine (HUMANQUESTION section D / C6). The importer consumes this to UN-QUARANTINE an animal: for a matching (name + dob) it accepts the given authoritative field(s) — `genotype`, `farbschlag`, and/or `dateOfDeath` (DD.MM.YYYY) — and skips the conflict. Key match = normalize(name) + dob, same identity as dedup. Maintained by god (Michael) as Julian/his wife answer the D-conflicts; originals (xlsx) stay read-only.", "resolutions": [ { "name": "Firefly von den Kleinen Chaoten", @@ -14,6 +14,13 @@ "decision": "P-locus = PP (not P-)", "genotype": "aa c[chm]c[chm] D- Ee gg PP spsp", "source": "Julian 2026-06-06 — HUMANQUESTION D3" + }, + { + "name": "Flint von den Kleinen Chaoten", + "dob": "23.12.2017", + "decision": "death date = 10.05.2021 (the 10.05.2022 variant was a year typo)", + "dateOfDeath": "10.05.2021", + "source": "Julian 2026-06-06 — HUMANQUESTION D5" } ] }