museum-digital/MDAllowedValueSets
36
0
Fork 1
Code Issues 14 Pull Requests Releases Wiki Activity

Accept iconclass names with specifying brackets

Browse Source
This commit is contained in:
Joshua Ramon Enslin
2026-02-12 14:08:10 +01:00
parent ab38fe88c4
commit 0792438a83
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/enums/MDNodaRepository.php
View File

@@ -399,8 +399,7 @@ enum MDNodaRepository implements MDValueEnumInterface, JsonSerializable {
*/
private static function validateIconclassId(string $id):string|false {
if (filter_var($id, FILTER_VALIDATE_URL) !== false) {
$id = rtrim(strtr($id, [
$id = trim(strtr($id, [
'http://iconclass.org/rkd/' => '',
'http://iconclass.org/' => '',
'https://iconclass.org/' => '',
@@ -408,17 +407,17 @@ enum MDNodaRepository implements MDValueEnumInterface, JsonSerializable {
'http://www.iconclass.org/' => '',
'https://www.iconclass.org/' => '',
]), '/');
}
$id = trim($id, "/");
if (!empty(trim($id, '0123456789abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ(+)'))) {
if (!empty(trim($id, '0123456789abcdefghijklmnopqrstuvwxyzäüö-/ABCDEFGHIJKLMNOPQRSTUVWXYZÄÜÖ(+)'))) {
// Try url_decoding
$id = urldecode($id);
if (!empty(trim($id, '0123456789abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ(+)'))) {
if (!empty(trim($id, '0123456789abcdefghijklmnopqrstuvwxyzäüö-/ABCDEFGHIJKLMNOPQRSTUVWXYZÄÜÖ(+)'))) {
return false;
}
}
if (!is_numeric(substr($id, 0, 1))) return false;
return $id;
}

2
tests/MDNodaRepositoryTest.php
View File

@@ -415,6 +415,8 @@ final class MDNodaRepositoryTest extends TestCase {
yield "45C221 ; ID" => ["45C221", "45C221"];
yield "45C221(+321) ; ID" => ["45C221(+321)", "45C221(+321)"];
yield "45C221(%2B321) > 45C221(+321) ; ID" => ["45C221(+321)", "45C221(%2B321)"];
yield "82A(Rattenfanger) ; ID" => ["82A(Rattenfanger)", "http://iconclass.org/rkd/82A(Rattenfanger)"];
yield "82A(Rattenfänger) ; ID" => ["82A(Rattenfänger)", "http://iconclass.org/rkd/82A(Rattenfänger)"];
yield "Broken input / adfdasjfklasäj%l" => [false, "adfdasjfklasäj%l"];
}