From f1ca8a6e9a8d16bf34a9cecfe73707bdb8bc7146 Mon Sep 17 00:00:00 2001
From: Dorian Merz <merz@ub.uni-leipzig.de>
Date: Mon, 24 Aug 2020 15:40:50 +0200
Subject: [PATCH] refs #18225 Revert "refs #15134 [master] marcfield 856 online
information"
This reverts commit 4e25eb883aa3acf60eff516239a006ea434a11cf.
---
.../finc/RecordDriver/SolrMarcFincTrait.php | 38 +++----------------
1 file changed, 5 insertions(+), 33 deletions(-)
diff --git a/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php b/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
index 88a0c6846b6..74fc5a99320 100644
--- a/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
+++ b/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
@@ -116,43 +116,18 @@ trait SolrMarcFincTrait
if ($address) {
$address = $address->getData();
- //$tmpArr = [];
+ $tmpArr = [];
// Is there a description? If not, just use the URL
// itself.
- /*foreach (['y', '3', 'z', 'x'] as $current) {
+ foreach (['y', '3', 'z', 'x'] as $current) {
$desc = $url->getSubfield($current);
if ($desc) {
$desc = $desc->getData();
$tmpArr[] = $desc;
}
- }*/
-
- $desc = false;
- if ($url->getSubfield('y')) {
- $desc = $url->getSubfield('y');
- } elseif ($url->getSubfield('n')) {
- $desc = $url->getSubfield('n');
- } elseif ($url->getSubfield('3')) {
- $desc = $url->getSubfield('3');
}
-
-
- if ($desc) {
- $desc = $desc->getData();
- $desc = strlen($desc) > 3 ?
- $desc : 'Online Information';
-
- if (isset($this->mainConfig->UrlDesc->desc)) {
- $tmpDesc = $this->mainConfig->UrlDesc->desc->toArray();
- if (in_array($desc, $tmpDesc)) {
- $desc = 'Online Information';
- }
- }
- } else {
- $desc = 'Online Information';
- }
- //$tmpArr = array_unique($tmpArr);
- //$desc = implode(', ', $tmpArr);
+ $tmpArr = array_unique($tmpArr);
+ $desc = implode(', ', $tmpArr);
// If no description take url as description
// For 856[40] url denoting resource itself
@@ -175,10 +150,7 @@ trait SolrMarcFincTrait
$retVal
)
) {
- $retVal[] = [
- 'url' => $address, 'desc' => $desc,
- 'indicators' => $indicator1.$indicator2
- ];
+ $retVal[] = ['url' => $address, 'desc' => $desc];
}
}
}
--
GitLab