From bc7f10ace5c5d133d76059108b756d15db8cb61c Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgnerf@ub.uni-leipzig.de>
Date: Thu, 22 Jun 2017 10:34:20 +0200
Subject: [PATCH] refs #10771: * bugfix iteration error of ViewHelper
ExternalCatalogueLinks * adjust scheme of ExternalCatalogue.schema for dnb
isils e.g. DE-101a
---
local/config/vufind/ExternalCatalogue.schema.json | 4 ++--
.../finc/src/finc/View/Helper/Root/ExternalCatalogueLink.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/local/config/vufind/ExternalCatalogue.schema.json b/local/config/vufind/ExternalCatalogue.schema.json
index 70bc58f9e9b..9ebddda25a4 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 04e096bb685..eb247bd7844 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);
--
GitLab