Skip to content
Snippets Groups Projects
Commit bc7f10ac authored by Frank Morgner's avatar Frank Morgner
Browse files

refs #10771:

 * bugfix iteration error of ViewHelper ExternalCatalogueLinks
* adjust scheme of ExternalCatalogue.schema for dnb isils e.g. DE-101a
parent e71f7ed0
No related merge requests found
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"properties": { "properties": {
"id": { "id": {
"patternProperties": { "patternProperties": {
"([A-Z0-9]*)-([A-Z0-9]*)": { "([A-Z0-9]*)-([a-zA-Z0-9]*)": {
"properties": { "properties": {
"pattern": { "pattern": {
"description": "URL pattern for replacement with identifier", "description": "URL pattern for replacement with identifier",
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
}, },
"ppn": { "ppn": {
"patternProperties": { "patternProperties": {
"([A-Z0-9]*)-([A-Z0-9]*)": { "([A-Z0-9]*)-([a-zA-Z0-9]*)": {
"properties": { "properties": {
"pattern": { "pattern": {
"description": "URL pattern for replacement with identifier", "description": "URL pattern for replacement with identifier",
......
...@@ -132,13 +132,13 @@ class ExternalCatalogueLink extends \Zend\View\Helper\AbstractHelper ...@@ -132,13 +132,13 @@ class ExternalCatalogueLink extends \Zend\View\Helper\AbstractHelper
foreach ($accessUrl as $institution => $v) { foreach ($accessUrl as $institution => $v) {
// pre-filter replaceId // pre-filter replaceId
if (isset($v['filter'])) { if (isset($v['filter'])) {
$replaceId = ( $isReplaceId = (
true === $this->filterAccessibilityUrl($v['filter']) true === $this->filterAccessibilityUrl($v['filter'])
) ? $replaceId : null; ) ? $replaceId : null;
} }
// institution filter // institution filter
if (true === in_array($institution, $institutions) if (true === in_array($institution, $institutions)
&& !empty($replaceId) && !empty($isReplaceId)
) { ) {
$extUrls[++$i]['desc'] = $institution; $extUrls[++$i]['desc'] = $institution;
$extUrls[$i]['url'] = sprintf($v['pattern'], $replaceId); $extUrls[$i]['url'] = sprintf($v['pattern'], $replaceId);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment