From f8f5cfd5cc2e9ad4138cd15af129484702d1f71c Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Mon, 28 Sep 2020 12:13:33 +0200
Subject: [PATCH] removed the part added to set the topic code and description
 in the step of project preparation

---
 .../project/PrepareProjects.java              | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/PrepareProjects.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/PrepareProjects.java
index 948b7d6de..6f0cf6de6 100644
--- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/PrepareProjects.java
+++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/PrepareProjects.java
@@ -6,9 +6,7 @@ import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
 import java.util.*;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.spark.SparkConf;
-import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.api.java.function.FlatMapFunction;
 import org.apache.spark.api.java.function.MapFunction;
 import org.apache.spark.sql.Dataset;
@@ -20,8 +18,8 @@ import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import eu.dnetlib.dhp.actionmanager.project.csvutils.CSVProgramme;
-import eu.dnetlib.dhp.actionmanager.project.csvutils.CSVProject;
+import eu.dnetlib.dhp.actionmanager.project.utils.CSVProgramme;
+import eu.dnetlib.dhp.actionmanager.project.utils.CSVProject;
 import eu.dnetlib.dhp.application.ArgumentApplicationParser;
 import eu.dnetlib.dhp.common.HdfsSupport;
 import scala.Tuple2;
@@ -97,25 +95,25 @@ public class PrepareProjects {
 			if (csvProject.isPresent()) {
 
 				String[] programme = csvProject.get().getProgramme().split(";");
-				String topic = csvProject.get().getTopics();
-				String topicdescription = Optional
-					.ofNullable(csvProject.get().getTopics())
-					.map(topics -> {
-						if (topic.equalsIgnoreCase(value._1().getTopiccode())) {
-							return value._1().getTopicdescription();
-						}
-						return null;
-					})
-					.orElse(null);
+//				String topic = csvProject.get().getTopics();
+//				String topicdescription = Optional
+//					.ofNullable(csvProject.get().getTopics())
+//					.map(topics -> {
+//						if (topic.equalsIgnoreCase(value._1().getTopiccode())) {
+//							return value._1().getTopicdescription();
+//						}
+//						return null;
+//					})
+//					.orElse(null);
 
 				Arrays
 					.stream(programme)
 					.forEach(p -> {
 						CSVProject proj = new CSVProject();
-						proj.setTopics(topic);
-						if (topicdescription != null) {
-							proj.setTopicdescription(topicdescription);
-						}
+//						proj.setTopics(topic);
+//						if (topicdescription != null) {
+//							proj.setTopicdescription(topicdescription);
+//						}
 
 						proj.setProgramme(p);
 						proj.setId(csvProject.get().getId());