diff --git a/local/config/vufind/ExternalCatalogue.schema.json b/local/config/vufind/ExternalCatalogue.schema.json index 70bc58f9e9b66a83910aea1e0522bec7285c2d5a..9ebddda25a4ad481798b704333d7a6068f5fbf7d 100644 --- a/local/config/vufind/ExternalCatalogue.schema.json +++ b/local/config/vufind/ExternalCatalogue.schema.json @@ -6,7 +6,7 @@ "properties": { "id": { "patternProperties": { - "([A-Z0-9]*)-([A-Z0-9]*)": { + "([A-Z0-9]*)-([a-zA-Z0-9]*)": { "properties": { "pattern": { "description": "URL pattern for replacement with identifier", @@ -29,7 +29,7 @@ }, "ppn": { "patternProperties": { - "([A-Z0-9]*)-([A-Z0-9]*)": { + "([A-Z0-9]*)-([a-zA-Z0-9]*)": { "properties": { "pattern": { "description": "URL pattern for replacement with identifier", diff --git a/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLink.php b/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLink.php index 04e096bb68534c13e06e2953f38fa979211c0633..eb247bd784465d2ca64d5a6624048c7269df4641 100644 --- a/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLink.php +++ b/module/finc/src/finc/View/Helper/Root/ExternalCatalogueLink.php @@ -132,13 +132,13 @@ class ExternalCatalogueLink extends \Zend\View\Helper\AbstractHelper foreach ($accessUrl as $institution => $v) { // pre-filter replaceId if (isset($v['filter'])) { - $replaceId = ( + $isReplaceId = ( true === $this->filterAccessibilityUrl($v['filter']) ) ? $replaceId : null; } // institution filter if (true === in_array($institution, $institutions) - && !empty($replaceId) + && !empty($isReplaceId) ) { $extUrls[++$i]['desc'] = $institution; $extUrls[$i]['url'] = sprintf($v['pattern'], $replaceId);