From f754c424bd87aaf6d403e3734a281288b584de83 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Mon, 25 May 2020 10:35:02 +0200
Subject: [PATCH] changed logic to compute only onece PacePerson for each
 Author to be enriched

---
 .../SparkOrcidToResultFromSemRelJob.java      | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/orcidtoresultfromsemrel/SparkOrcidToResultFromSemRelJob.java b/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/orcidtoresultfromsemrel/SparkOrcidToResultFromSemRelJob.java
index e4ffc5698..34882b587 100644
--- a/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/orcidtoresultfromsemrel/SparkOrcidToResultFromSemRelJob.java
+++ b/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/orcidtoresultfromsemrel/SparkOrcidToResultFromSemRelJob.java
@@ -122,29 +122,24 @@ public class SparkOrcidToResultFromSemRelJob {
 	}
 
 	private static void enrichAuthor(Author a, List<AutoritativeAuthor> au) {
+		PacePerson pp = new PacePerson(a.getFullname(), false);
 		for (AutoritativeAuthor aa : au) {
-			if (enrichAuthor(aa, a)) {
+			if (enrichAuthor(aa, a, pp.getNormalisedFirstName(), pp.getNormalisedSurname() )) {
 				return;
 			}
 		}
 	}
 
-	private static boolean enrichAuthor(AutoritativeAuthor autoritative_author, Author author) {
+	private static boolean enrichAuthor(AutoritativeAuthor autoritative_author, Author author,
+										String author_name,
+										String author_surname) {
 			boolean toaddpid = false;
 
-			String author_name = author.getName();
-			String author_surname = author.getSurname();
-
-			if(StringUtils.isEmpty(author_name) || StringUtils.isEmpty(author_surname)){
-				PacePerson pp = new PacePerson(author.getFullname(), false);
-				if (pp.isAccurate()){
-					author_name = pp.getNormalisedFirstName();
-					author_surname = pp.getNormalisedSurname();
-
-				}
-			}
 
 			if (StringUtils.isNotEmpty(autoritative_author.getSurname())) {
+				if (StringUtils.isNotEmpty(author.getSurname())){
+					author_surname = author.getSurname();
+				}
 				if (StringUtils.isNotEmpty(author_surname)) {
 					if (autoritative_author
 							.getSurname()
@@ -153,6 +148,9 @@ public class SparkOrcidToResultFromSemRelJob {
 
 						// have the same surname. Check the name
 						if (StringUtils.isNotEmpty(autoritative_author.getName())) {
+							if(StringUtils.isNotEmpty(author.getName())){
+								author_name = author.getName();
+							}
 							if (StringUtils.isNotEmpty(author_name)) {
 								if (autoritative_author
 										.getName()