|
12 | 12 |
|
13 | 13 | namespace Kitodo\Dlf\Common; |
14 | 14 |
|
| 15 | +use \DOMNodeList; |
15 | 16 | use \DOMElement; |
16 | 17 | use \DOMXPath; |
17 | 18 | use \SimpleXMLElement; |
@@ -675,13 +676,15 @@ private function setMetadataFieldValues(array $resArray, DOMXPath $domXPath, DOM |
675 | 676 | { |
676 | 677 | if ($resArray['format'] > 0 && !empty($resArray['xpath'])) { |
677 | 678 | $values = $domXPath->evaluate($resArray['xpath'], $domNode); |
678 | | - if ($values instanceof \DOMNodeList && $values->length > 0) { |
| 679 | + if ($values instanceof DOMNodeList && $values->length > 0) { |
679 | 680 | $metadata[$resArray['index_name']] = []; |
680 | 681 | foreach ($values as $value) { |
681 | 682 | $metadata[$resArray['index_name']][] = trim((string) $value->nodeValue); |
682 | 683 | } |
683 | | - } elseif (!($values instanceof \DOMNodeList)) { |
684 | | - $metadata[$resArray['index_name']] = [trim((string) $values)]; |
| 684 | + } elseif (!($values instanceof DOMNodeList)) { |
| 685 | + if (!empty($values)) { |
| 686 | + $metadata[$resArray['index_name']] = [trim((string) $values)]; |
| 687 | + } |
685 | 688 | } |
686 | 689 | } |
687 | 690 | } |
@@ -720,9 +723,9 @@ private function setSortableMetadataValue(array $resArray, DOMXPath $domXPath, D |
720 | 723 | if (!empty($metadata[$resArray['index_name']]) && $resArray['is_sortable']) { |
721 | 724 | if ($resArray['format'] > 0 && !empty($resArray['xpath_sorting'])) { |
722 | 725 | $values = $domXPath->evaluate($resArray['xpath_sorting'], $domNode); |
723 | | - if ($values instanceof \DOMNodeList && $values->length > 0) { |
| 726 | + if ($values instanceof DOMNodeList && $values->length > 0) { |
724 | 727 | $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $values->item(0)->nodeValue); |
725 | | - } elseif (!($values instanceof \DOMNodeList)) { |
| 728 | + } elseif (!($values instanceof DOMNodeList)) { |
726 | 729 | $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $values); |
727 | 730 | } |
728 | 731 | } |
|
0 commit comments