From 98e51a1e52af9fb68296bb5f08e654bb7dfcbf03 Mon Sep 17 00:00:00 2001
From: Geoffrey Karnbach <geoffrey.karnbach@gmail.com>
Date: Mon, 23 Dec 2024 11:15:09 +0100
Subject: [PATCH] Export: Fix bug with null ORCID in exported documented,
 remove ORCID if value is null from export

---
 .../AbstractTemplateExportScienceEuropeComponents.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/damap/base/conversion/AbstractTemplateExportScienceEuropeComponents.java b/src/main/java/org/damap/base/conversion/AbstractTemplateExportScienceEuropeComponents.java
index 23f4894b..7a2cd6f8 100644
--- a/src/main/java/org/damap/base/conversion/AbstractTemplateExportScienceEuropeComponents.java
+++ b/src/main/java/org/damap/base/conversion/AbstractTemplateExportScienceEuropeComponents.java
@@ -128,10 +128,10 @@ private String getContributorPersonIdentifier(Contributor contributor) {
     String identifier = null;
     Identifier personIdentifier = contributor != null ? contributor.getPersonIdentifier() : null;
 
-    if (personIdentifier != null) {
+    if (personIdentifier != null && personIdentifier.getIdentifier() != null) {
       String contactIdentifierId = personIdentifier.getIdentifier();
       if (personIdentifier.getIdentifierType().equals(EIdentifierType.ORCID)) {
-        identifier = "ORCID iD: " + contactIdentifierId;
+        identifier = "ORCID: " + contactIdentifierId;
       }
     }