D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 12 Projects 2 Releases 2 Wiki Activity

Adding H2020 Classification, topic code and topic description to H2020 projects #46

Merged
claudio.atzori merged 59 commits from miriam.baglioni/dnet-hadoop:h2020classification into master 2020-10-05 14:14:39 +02:00
Conversation 1 Commits 59 Files Changed 35 +6 -2
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 969fa8d96e - Show all commits

2
dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/ReadProjectsFromDB.java
View File

@ -33,7 +33,7 @@ public class ReadProjectsFromDB implements Closeable {
private final BufferedWriter writer; private final BufferedWriter writer;
private final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); private final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private final static String query = "SELECT code , optional1, optional2" + private final static String query = "SELECT code , optional1, optional2 " +
"from projects where id like 'corda__h2020%' "; "from projects where id like 'corda__h2020%' ";
public static void main(final String[] args) throws Exception { public static void main(final String[] args) throws Exception {

2
dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/SparkAtomicActionJob.java
View File

@ -147,7 +147,7 @@ public class SparkAtomicActionJob {
} }
private static void setLevels(H2020Classification h2020Classification, String classification) { private static void setLevels(H2020Classification h2020Classification, String classification) {
String[] tmp = classification.split(" | "); String[] tmp = classification.split(" \\| ");
h2020Classification.setLevel1(tmp[0]); h2020Classification.setLevel1(tmp[0]);
if (tmp.length > 1) { if (tmp.length > 1) {
h2020Classification.setLevel2(tmp[1]); h2020Classification.setLevel2(tmp[1]);

4
dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/project/CSVParserTest.java
View File

@ -7,10 +7,14 @@ import java.nio.file.Path;
import java.util.List; import java.util.List;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.spark.api.java.function.FilterFunction;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import com.google.gson.Gson;
import eu.dnetlib.dhp.actionmanager.project.csvutils.CSVParser; import eu.dnetlib.dhp.actionmanager.project.csvutils.CSVParser;
import eu.dnetlib.dhp.actionmanager.project.csvutils.CSVProgramme;
public class CSVParserTest { public class CSVParserTest {