Merge pull request #4618 from kaitlinnewson/10796-main

pkp · Jan 23, 2025 · 0857a4f · 0857a4f
2 parents c91ba85 + bd7de15
commit 0857a4f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/plugins/generic/crossref b/plugins/generic/crossref
diff --git a/plugins/generic/datacite/filter/DataciteXmlFilter.php b/plugins/generic/datacite/filter/DataciteXmlFilter.php
@@ -311,7 +311,7 @@ public function createCreatorsNode(DOMDocument $doc, Issue $issue, Publication $
                 foreach ($authors as $author) { /** @var Author $author */
                     $creators[] = [
                         'name' => $author->getFullName(false, true, $publication->getData('locale')),
-                        'orcid' => $author->getOrcid(),
+                        'orcid' => $author->getData('orcidIsVerified') ? $author->getData('orcid') : null,
                         'affiliation' => $author->getLocalizedData('affiliation', $publication->getData('locale')),
                         'ror' => $author->getData('rorId') ?? null
                     ];

diff --git a/plugins/importexport/doaj/filter/DOAJJsonFilter.php b/plugins/importexport/doaj/filter/DOAJJsonFilter.php
@@ -162,8 +162,8 @@ public function &process(&$pubObject)
                 if (!empty($affiliation)) {
                     $author['affiliation'] = $affiliation;
                 }
-                if ($orcid = $articleAuthor->getData('orcid')) {
-                    $author['orcid_id'] = $orcid;
+                if ($articleAuthor->getData('orcid') && $articleAuthor->getData('orcidIsVerified')) {
+                    $author['orcid_id'] = $articleAuthor->getData('orcid');
                 }
                 $article['bibjson']['author'][] = $author;
             }

diff --git a/plugins/importexport/doaj/filter/DOAJXmlFilter.php b/plugins/importexport/doaj/filter/DOAJXmlFilter.php
@@ -251,8 +251,8 @@ public function createAuthorNode($doc, $publication, $author, $affilList)
         if (in_array($author->getAffiliation($publication->getData('locale')), $affilList) && !empty($affilList[0])) {
             $authorNode->appendChild($node = $doc->createElement('affiliationId', htmlspecialchars(current(array_keys($affilList, $author->getAffiliation($publication->getData('locale')))), ENT_COMPAT, 'UTF-8')));
         }
-        if ($orcid = $author->getData('orcid')) {
-            $authorNode->appendChild($doc->createElement('orcid_id'))->appendChild($doc->createTextNode($orcid));
+        if ($author->getData('orcid') && $author->getData('orcidIsVerified')) {
+            $authorNode->appendChild($doc->createElement('orcid_id'))->appendChild($doc->createTextNode($author->getData('orcid')));
         }
         return $authorNode;
     }

diff --git a/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php b/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
@@ -216,13 +216,16 @@ public function generateAuthorNode($doc, $journal, $issue, $submission, $author)
             $authorElement->appendChild($doc->createElement('LastName'))->appendChild($doc->createTextNode(ucfirst($author->getLocalizedFamilyName())));
         }
         $authorElement->appendChild($doc->createElement('Affiliation'))->appendChild($doc->createTextNode($author->getLocalizedAffiliation()));
-        // We're storing the ORCID with a URL (http://orcid.org/{$ID}), but the XML expects just the ID
-        $orcidId = explode('/', trim($author->getData('orcid') ?? '', '/'));
-        $orcidId = array_pop($orcidId);
-        if ($orcidId) {
-            $orcidNode = $authorElement->appendChild($doc->createElement('Identifier'));
-            $orcidNode->setAttribute('Source', 'ORCID');
-            $orcidNode->appendChild($doc->createTextNode($orcidId));
+
+        if ($author->getData('orcid') && $author->getData('orcidIsVerified')) {
+            // We're storing the ORCID with a URL (http://orcid.org/{$ID}), but the XML expects just the ID
+            $orcidId = explode('/', trim($author->getData('orcid') ?? '', '/'));
+            $orcidId = array_pop($orcidId);
+            if ($orcidId) {
+                $orcidNode = $authorElement->appendChild($doc->createElement('Identifier'));
+                $orcidNode->setAttribute('Source', 'ORCID');
+                $orcidNode->appendChild($doc->createTextNode($orcidId));
+            }
         }
 
         return $authorElement;

diff --git a/plugins/oaiMetadataFormats/marc/templates/record.tpl b/plugins/oaiMetadataFormats/marc/templates/record.tpl
@@ -37,7 +37,7 @@
 			{assign var=affiliation value=$author->getAffiliation($journal->getPrimaryLocale())}
 			{if $affiliation}<subfield label="u">{$affiliation|escape}</subfield>{/if}
 			{if $author->getUrl()}<subfield label="0">{$author->getUrl()|escape}</subfield>{/if}
-			{if $author->getData('orcid')}<subfield label="0">{$author->getData('orcid')|escape}</subfield>{/if}
+			{if $author->getData('orcid') && $author->getData('orcidIsVerified')}<subfield label="0">{$author->getData('orcid')|escape}</subfield>{/if}
 		</varfield>
 	{/foreach}
 	{if $subject}<varfield id="653" i1=" " i2=" ">

diff --git a/plugins/oaiMetadataFormats/marcxml/templates/record.tpl b/plugins/oaiMetadataFormats/marcxml/templates/record.tpl
@@ -46,7 +46,7 @@
 			{assign var=affiliation value=$author->getAffiliation($journal->getPrimaryLocale())}
 			{if $affiliation}<subfield code="u">{$affiliation|escape}</subfield>{/if}
 			{if $author->getUrl()}<subfield code="0">{$author->getUrl()|escape}</subfield>{/if}
-			{if $author->getData('orcid')}<subfield code="0">{$author->getData('orcid')|escape}</subfield>{/if}
+			{if $author->getData('orcid') && $author->getData('orcidIsVerified')}<subfield code="0">{$author->getData('orcid')|escape}</subfield>{/if}
 		</datafield>
 	{/foreach}
 	{if $subject}<datafield tag="653" ind1=" " ind2=" ">
+1 −0		CrossrefExportDeployment.php
+1 −0		CrossrefExportPlugin.php
+4 −17		CrossrefPlugin.php
+26 −29		filter/ArticleCrossrefXmlFilter.php