From 2566b97138e8628b045f46adef2ac410635f3593 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Mon, 17 Jul 2023 16:28:46 +0200 Subject: [PATCH] [dumpCSV] remove not needed code --- .../dhp/oa/graph/dump/csv/SparkDumpResults.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/csv/SparkDumpResults.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/csv/SparkDumpResults.java index f2d1e73..70ed912 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/csv/SparkDumpResults.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/csv/SparkDumpResults.java @@ -150,9 +150,9 @@ public class SparkDumpResults implements Serializable { ar.setRank(String.valueOf(count)); } } - ar.setFirstName(replace(a.getName())); - ar.setLastName(replace(a.getSurname())); - ar.setFullName(replace(a.getFullname())); + ar.setFirstName(removeBreaks(a.getName())); + ar.setLastName(removeBreaks(a.getSurname())); + ar.setFullName(removeBreaks(a.getFullname())); Tuple2 orcid = getOrcid(a.getPid()); if (Optional.ofNullable(orcid).isPresent()) { ar.setOrcid(orcid._1()); @@ -217,13 +217,6 @@ public class SparkDumpResults implements Serializable { } - private static String replace(String input) { - if (Optional.ofNullable(input).isPresent()) - return input.replace("\t", " ").replace("\n", " ").replace("\r", " ").replace("\"", " "); - else - return ""; - } - private static List mapPid(List pid, String resultId) { return pid .stream() @@ -354,7 +347,8 @@ public class SparkDumpResults implements Serializable { } private static String removeBreaks(String input) { - return input.replace("\n", " ").replace("\t", " ") + return input.replace("\n", " ") + .replace("\t", " ") .replace("\r", " ") .replace("\\\"", " ") .replace("\"", " ")