From 3f236d9f5e3e746ae8c6882e96b5f38d8539085f Mon Sep 17 00:00:00 2001 From: Joshua Ramon Enslin Date: Thu, 27 Jul 2023 01:44:23 +0200 Subject: [PATCH] Extend concordance lists --- src/MDConcEventTypes.php | 15 +++++++++++---- src/MDConcLicenses.php | 6 ++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/MDConcEventTypes.php b/src/MDConcEventTypes.php index 7d00b1e..ffc96ee 100644 --- a/src/MDConcEventTypes.php +++ b/src/MDConcEventTypes.php @@ -17,14 +17,17 @@ final class MDConcEventTypes implements MDImporterConcordanceListInterface { 'Hergestellt' => 1, 'Herstellung' => 1, 'Bearbeitung' => 1, - 'Erschaffung/Herstellung' => 1, - 'creation' => 1, 'Beginning of existence' => 1, + 'creation' => 1, + 'Erschaffung/Herstellung' => 1, // 2: Was found + 'Auffinden' => 2, + 'Ausgrabung' => 2, + 'Finding' => 2, 'Fund' => 2, 'Fund (Aktivität)' => 2, - 'Ausgrabung' => 2, + 'Gefunden' => 2, // 3: Published // 4: Template creation @@ -69,9 +72,13 @@ final class MDConcEventTypes implements MDImporterConcordanceListInterface { 'design' => 35, 'Designing' => 35, 'Entwerfen' => 35, + 'Kulturelle Zuschreibung' => 35, + 'Merkmalszuweisung' => 35, + 'http://terminology.lido-schema.org/lido00024' => 35, // 41: Was Bought 'Erwerb' => 41, + 'Erwerbung' => 41, 'Acquisition (Activity)' => 41, ]; @@ -86,7 +93,7 @@ final class MDConcEventTypes implements MDImporterConcordanceListInterface { public static function getConcordanceTarget(string $input):int { if (!isset(self::EVENT_TYPE_NAMES_TO_ID[$input])) { - throw new MDImporterMissingConcordance("Unknown entry type: " . $input); + throw new MDImporterMissingConcordance("Unknown entry type: '" . $input . "'"); } return self::EVENT_TYPE_NAMES_TO_ID[$input]; diff --git a/src/MDConcLicenses.php b/src/MDConcLicenses.php index 394b0be..0d2e036 100644 --- a/src/MDConcLicenses.php +++ b/src/MDConcLicenses.php @@ -17,11 +17,14 @@ final class MDConcLicenses implements MDImporterConcordanceListInterface { "CC0 1.0" => "CC0", "CC 0 1.0" => "CC0", "CC_0 1.0" => "CC0", + "http://creativecommons.org/publicdomain/zero/1.0/" => "CC0", + "https://creativecommons.org/publicdomain/zero/1.0/" => "CC0", "https://creativecommons.org/publicdomain/zero/1.0/deed.de" => "CC0", "CC_BY" => "CC BY", "CC-BY" => "CC BY", "CC.BY" => "CC BY", + "http://creativecommons.org/licenses/by/4.0" => "CC BY", "https://creativecommons.org/licenses/by/4.0" => "CC BY", "https://creativecommons.org/licenses/by/4.0/" => "CC BY", @@ -32,6 +35,7 @@ final class MDConcLicenses implements MDImporterConcordanceListInterface { "CC-BY-SA" => "CC BY-SA", "CC.BY-SA" => "CC BY-SA", "CC BY-SA 4.0" => "CC BY-SA", + "http://creativecommons.org/licenses/by-sa/4.0/" => "CC BY-SA", "https://creativecommons.org/licenses/by-sa/4.0/" => "CC BY-SA", "Namensnennung - Weitergabe unter gleichen Bedingungen 4.0 International (CC BY-SA 4.0)" => "CC BY-SA", @@ -39,6 +43,7 @@ final class MDConcLicenses implements MDImporterConcordanceListInterface { "CC_BY_NC" => "CC BY-NC", "CC-BY-NC" => "CC BY-NC", "CC.BY-NC" => "CC BY-NC", + "http://creativecommons.org/licenses/by-nc/4.0/" => "CC BY-NC", "https://creativecommons.org/licenses/by-nc/4.0/" => "CC BY-NC", "CC BY_NC_SA" => "CC BY-NC-SA", @@ -56,6 +61,7 @@ final class MDConcLicenses implements MDImporterConcordanceListInterface { "CC_BY_NC_ND" => "CC BY-NC-ND", "CC-BY-NC-ND" => "CC BY-NC-ND", "CC.BY-NC-ND" => "CC BY-NC-ND", + "http://creativecommons.org/licenses/by-nc-nd/4.0/" => "CC BY-NC-ND", "https://creativecommons.org/licenses/by-nc-nd/4.0/" => "CC BY-NC-ND", "https://www.deutsche-digitale-bibliothek.de/content/lizenzen/rv-fz" => "RR-F",