From 0421f5e1d8d964cc30034b2c533be9ce4bb89fd7 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Thu, 1 Apr 2021 17:38:30 +0200
Subject: [PATCH] added check to verify not to add void APC

---
 .../eu/dnetlib/dhp/oa/graph/dump/ResultMapper.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/ResultMapper.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/ResultMapper.java
index b1f5e11d0..93976b066 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/ResultMapper.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/ResultMapper.java
@@ -427,10 +427,15 @@ public class ResultMapper implements Serializable {
 		Optional<Field<String>> oPca = Optional.ofNullable(i.getProcessingchargeamount());
 		Optional<Field<String>> oPcc = Optional.ofNullable(i.getProcessingchargecurrency());
 		if (oPca.isPresent() && oPcc.isPresent()) {
-			APC apc = new APC();
-			apc.setCurrency(oPcc.get().getValue());
-			apc.setAmount(oPca.get().getValue());
-			instance.setArticleprocessingcharge(apc);
+			Field<String> pca = oPca.get();
+			Field<String> pcc = oPcc.get();
+			if(pca.getValue().trim() != "" && pcc.getValue().trim() != ""){
+				APC apc = new APC();
+				apc.setCurrency(oPcc.get().getValue());
+				apc.setAmount(oPca.get().getValue());
+				instance.setArticleprocessingcharge(apc);
+			}
+
 		}
 	}