museum-digital/MDAllowedValueSets
32
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Compare commits

base: museum-digital:10aedafad10e0e42eb92473e8f0c68dfbcae85ae
Branches Tags
museum-digital:master
...
compare: museum-digital:0698b6e487e33fbddb7a51db5716fc4e35688c36
Branches Tags
museum-digital:master

2 Commits
10aedafad1 ... 0698b6e487

Author SHA1 Message Date
Joshua Ramon Enslin
0698b6e487 Merge branch 'master' of gitea:museum-digital/MDAllowedValueSets 2023-04-16 19:42:27 +02:00
Joshua Ramon Enslin
8e151e793f
Closer approximate a fix for the validation of GND IDs 2023-04-16 19:41:55 +02:00
1 changed files with 8 additions and 2 deletions
Show Stats Expand all files Collapse all files

10
src/enums/MDNodaRepository.php
View File

@ -278,7 +278,13 @@ enum MDNodaRepository implements MDValueEnumInterface, JsonSerializable {
$id = strtr($id, $toRemove); $id = strtr($id, $toRemove);
} }
if (preg_match("/^[0-9-X]*$/", $id) === false) return false; // There is an issue with this regex
if (preg_match("/^[0-9-X]*$/", $id) === false) {
return false;
}
if (is_numeric(strtr($id, ['-' => '', 'X' => ''])) === false) {
return false;
}
return $id; return $id;
@ -376,7 +382,7 @@ enum MDNodaRepository implements MDValueEnumInterface, JsonSerializable {
self::bnf => self::validateNumericId($id, ["https://catalogue.bnf.fr/ark:/12148/cb"]), self::bnf => self::validateNumericId($id, ["https://catalogue.bnf.fr/ark:/12148/cb"]),
self::cona => self::validateNumericId($id, ['https://vocab.getty.edu/page/cona/']), self::cona => self::validateNumericId($id, ['https://vocab.getty.edu/page/cona/']),
self::editionhumboldtdigital => self::validateGndId($id, ['https://edition-humboldt.de/register/personen/detail.xql?normid=http://d-nb.info/gnd/']), self::editionhumboldtdigital => self::validateGndId($id, ['https://edition-humboldt.de/register/personen/detail.xql?normid=http://d-nb.info/gnd/']),
self::gnd => self::validateGndId($id, ['https://d-nb.info/gnd/']), self::gnd => self::validateGndId($id, ['http://d-nb.info/gnd/', 'https://d-nb.info/gnd/']),
self::grobsystematik => self::validateNumericId($id, ['https://term.museum-digital.de/grobsystematik/tag/']), self::grobsystematik => self::validateNumericId($id, ['https://term.museum-digital.de/grobsystematik/tag/']),
self::iconclass => self::validateIconclassId($id), self::iconclass => self::validateIconclassId($id),
self::lcsh => self::validateLcshId($id), self::lcsh => self::validateLcshId($id),