diff --git a/values/availableFields.php b/values/availableFields.php index 1919866..5a85894 100644 --- a/values/availableFields.php +++ b/values/availableFields.php @@ -916,7 +916,7 @@ for ($i = 1; $i <= 2; $i++) { "allowedValues" => ["y", "n"], "dependsOn" => ["related_place{$i}"], "remark" => '', - "name_human_readable" => $event['where'] . " [{$csvxml_overview['certainty']}]", + "name_human_readable" => "{$event['where']} [{$csvxml_overview['certainty']}]", "explica" => "", ], ]); @@ -940,7 +940,15 @@ for ($i = 1; $i <= 2; $i++) { "allowedValues" => ["y", "n"], "dependsOn" => ["related_actor{$i}"], "remark" => '', - "name_human_readable" => $event['who'] . " [{$csvxml_overview['certainty']}]", + "name_human_readable" => "{$event['who']} [{$csvxml_overview['certainty']}]", + "explica" => "", + ], + "related_actor_gnd{$i}" => [ + "required" => false, + "allowedValues" => [], + "dependsOn" => ["related_actor{$i}", "related_actor_sure{$i}"], + "remark" => '', + "name_human_readable" => "{$event['who']} ({$event['gnd']})", "explica" => "", ], ]); @@ -1186,13 +1194,14 @@ function getSimpleAvailableFieldEntry(string $nameTL = "", string $explica = "", function generateGenericFullEvent(array $event, array $csvxml_overview, string $typeName, string $type, int $number):array { return [ - "{$type}_when{$number}" => getSimpleAvailableFieldEntry($typeName . ": " . $event['when'], "", ["{$type}_when_sure{$number}"]), - "{$type}_when_sure{$number}" => getSimpleAvailableFieldEntry($typeName . ": " . $event['when'] . " [{$csvxml_overview['certainty']}]", "", ["{$type}_when{$number}"], ["y", "n"]), - "{$type}_who{$number}" => getSimpleAvailableFieldEntry($typeName . ": " . $event['who'], "", ["{$type}_who_sure{$number}"]), - "{$type}_who_sure{$number}" => getSimpleAvailableFieldEntry($typeName . ": " . $event['who'] . " [{$csvxml_overview['certainty']}]", "", ["{$type}_who{$number}"], ["y", "n"]), - "{$type}_where{$number}" => getSimpleAvailableFieldEntry($typeName . ": " . $event['where'], "", ["{$type}_where_sure{$number}"]), - "{$type}_where_sure{$number}" => getSimpleAvailableFieldEntry($typeName . ": " . $event['where'] . " [{$csvxml_overview['certainty']}]", "", ["{$type}_where{$number}"], ["y", "n"]), - "{$type}_annotation{$number}" => getSimpleAvailableFieldEntry($typeName . ": " . $event['classic_annotation_intro'], ""), + "{$type}_when{$number}" => getSimpleAvailableFieldEntry("{$typeName}: {$event['when']}", "", ["{$type}_when_sure{$number}"]), + "{$type}_when_sure{$number}" => getSimpleAvailableFieldEntry("{$typeName}: {$event['when']} [{$csvxml_overview['certainty']}]", "", ["{$type}_when{$number}"], ["y", "n"]), + "{$type}_who{$number}" => getSimpleAvailableFieldEntry("{$typeName}: {$event['who']}", "", ["{$type}_who_sure{$number}"]), + "{$type}_who_sure{$number}" => getSimpleAvailableFieldEntry("{$typeName}: {$event['who']} [{$csvxml_overview['certainty']}]", "", ["{$type}_who{$number}"], ["y", "n"]), + "{$type}_who_gnd{$number}" => getSimpleAvailableFieldEntry("{$typeName}: {$event['who']} ({$event['gnd']})", "", ["{$type}_who_sure{$number}", "{$type}_who{$number}"]), + "{$type}_where{$number}" => getSimpleAvailableFieldEntry("{$typeName}: {$event['where']}", "", ["{$type}_where_sure{$number}"]), + "{$type}_where_sure{$number}" => getSimpleAvailableFieldEntry("{$typeName}: {$event['where']} [{$csvxml_overview['certainty']}]", "", ["{$type}_where{$number}"], ["y", "n"]), + "{$type}_annotation{$number}" => getSimpleAvailableFieldEntry("{$typeName}: {$event['classic_annotation_intro']}", ""), ]; }