[BUGFIX] Display author URI as an external link (kitodo#1568)

Co-authored-by: Sebastian Meyer <sebastian.meyer@opencultureconsulting.com>

Author: beatrycze-volk

Classes/Command/BaseCommand.php

@@ -212,10 +212,11 @@ protected function saveToDatabase(Document $document): bool
         $document->setPlace(implode('; ', $metadata['place']));
         $document->setYear(implode('; ', $metadata['year']));
 
-        // Remove appended "valueURI" from authors' names for storing in database.
+        // Get only authors' names for storing in database.
         foreach ($metadata['author'] as $i => $author) {
-            $splitName = explode(pack('C', 31), $author);
-            $metadata['author'][$i] = $splitName[0];
+            if (is_array($author)) {
+                $metadata['author'][$i] = $author['name'];
+            }
         }
         $document->setAuthor($this->getAuthors($metadata['author']));
         $document->setThumbnail($doc->thumbnail ? : '');

Classes/Controller/MetadataController.php

@@ -323,10 +323,14 @@ private function buildExternalUrlFromMetadata(array $metadata): array
 
         foreach ($metadata as $i => $section) {
             foreach ($section as $name => $value) {
-                if (($name == 'author' || $name == 'holder') && !empty($value) && !empty($value[0]['url'])) {
-                    $externalUrl[$i][$name]['externalUrl'] = $value[0];
+                if (($name == 'author' || $name == 'holder') && !empty($value)) {
+                    foreach ($value as $entry) {
+                        if (!empty($entry['url'])) {
+                            $externalUrl[$i][$name][] = $entry;
+                        }
+                    }
                 } elseif (($name == 'geonames' || $name == 'wikidata' || $name == 'wikipedia') && !empty($value)) {
-                    $externalUrl[$i][$name]['externalUrl'] = [
+                    $externalUrl[$i][$name][] = [
                         'name' => $value[0],
                         'url' => $value[0]
                     ];

Classes/Format/Mods.php

@@ -173,11 +173,16 @@ private function getAuthorFromXml(array $authors, int $i): void
                 $k++;
             }
             ksort($name);
+
             $this->metadata['author'][$i] = trim(implode(', ', $name));
         }
-        // Append "valueURI" to name using Unicode unit separator.
+
         if (isset($authors[$i]['valueURI'])) {
-            $this->metadata['author'][$i] .= pack('C', 31) . (string) $authors[$i]['valueURI'];
+            $displayName = $this->metadata['author'][$i];
+            $this->metadata['author'][$i] = [
+                'name' => $displayName,
+                'url' => (string) $authors[$i]['valueURI']
+            ];
         }
     }
 
@@ -263,9 +268,13 @@ private function getHolderFromViafApi(string $viafId, array $holders, int $i): v
     private function getHolderFromXml(array $holders, int $i): void
     {
         $this->getHolderFromXmlDisplayForm($holders, $i);
-        // Append "valueURI" to name using Unicode unit separator.
+
+        $displayName = $this->metadata['holder'][$i];
         if (isset($holders[$i]['valueURI'])) {
-            $this->metadata['holder'][$i] .= pack('C', 31) . (string) $holders[$i]['valueURI'];
+            $this->metadata['holder'][$i] = [
+                'name' => $displayName,
+                'url' => (string) $holders[$i]['valueURI']
+            ];
         }
     }
 

Resources/Private/Data/MetadataDefaults.json

@@ -103,7 +103,7 @@
             }
         ],
         "default_value": "",
-        "wrap": "key.wrap = <dt class=\"tx-dlf-metadata-author\">|</dt>\nvalue.required = 1\nvalue.split.token.char = 31\nvalue.split.cObjNum = 1\nvalue.split.1.1 = CASE\nvalue.split.1.1.key.data = register:SPLIT_COUNT\nvalue.split.1.1.0 = LOAD_REGISTER\nvalue.split.1.1.0.tx_dlf_metadata_author_name.current = 1\nvalue.split.1.1.1 = LOAD_REGISTER\nvalue.split.1.1.1.tx_dlf_metadata_author_uri.current = 1\nvalue.postCObject = TEXT\nvalue.postCObject.value = {register:tx_dlf_metadata_author_name}\nvalue.postCObject.value.insertData = 1\nvalue.postCObject.value.stdWrap.typolink.parameter = {register:tx_dlf_metadata_author_uri} _blank external\nvalue.postCObject.value.stdWrap.typolink.parameter.insertData = 1\nvalue.postCObject.value.stdWrap.typolink.title = {register:tx_dlf_metadata_author_name}\nvalue.postCObject.value.stdWrap.typolink.ifNotEmpty = 1\nvalue.wrap = <dd class=\"tx-dlf-metadata-author\">|</dd>",
+        "wrap": "key.wrap = <dt class=\"tx-dlf-metadata-author\">|</dt>\nvalue.required = 1\nvalue.wrap = <dd class=\"tx-dlf-metadata-author\">|</dd>",
         "index_tokenized": 1,
         "index_stored": 1,
         "index_indexed": 1,

Resources/Private/Partials/Metadata/Entries.html

@@ -19,6 +19,7 @@
 <f:variable name="wrappedValues"><f:spaceless>
     <f:for each="{documentMetadataSection.{configObject.indexName}}" as="value" iteration="iterator">
         <f:variable name="buildUrlVariable" value="{buildUrl.{sectionIterator.index}}" />
+        <f:variable name="externalUrlVariable" value="{externalUrl.{sectionIterator.index}}" />
         <f:if condition="{buildUrlVariable.{configObject.indexName}}">
             <f:then>
                 <f:render partial="Metadata/LinkEntry" arguments="{_all}"/>

Resources/Private/Partials/Metadata/ExternalLinkEntry.html

@@ -13,7 +13,15 @@
       xmlns:kitodo="http://typo3.org/ns/Kitodo/Dlf/ViewHelpers"
       data-namespace-typo3-fluid="true">
 
-<f:variable name="url" value="{externalUrlVariable.{configObject.indexName}.externalUrl.url}" />
-<f:variable name="value" value="{externalUrlVariable.{configObject.indexName}.externalUrl.name}" />
+<f:variable name="externalUrls" value="{externalUrlVariable.{configObject.indexName}}" />
 
-<f:link.external uri="{url}">{value}</f:link.external>
+<f:if condition="{configObject.indexName} == 'author'">
+    <f:then>
+        <kitodo:stdWrap wrap="{metadataWrap.value}" data="{metaSectionConfigObject}"><f:link.external uri="{value.url}">{value.name}</f:link.external></kitodo:stdWrap>
+    </f:then>
+    <f:else>
+        <f:for each="{externalUrls}" as="entry">
+            <kitodo:stdWrap wrap="{metadataWrap.value}" data="{metaSectionConfigObject}"><f:link.external uri="{entry.url}">{entry.name}</f:link.external></kitodo:stdWrap>
+        </f:for>
+    </f:else>
+</f:if>