diff --git a/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php b/module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php index 88a0c6846b618f6f94a4fdfebb2c037e637dbab6..74fc5a99320981ccb6a500519b3107089b41296b 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]; } } }