diff --git a/dump-schema/src/main/java/eu/dnetlib/dhp/skgif/model/Grant.java b/dump-schema/src/main/java/eu/dnetlib/dhp/skgif/model/Grant.java index 4cefdd2..bb3b0df 100644 --- a/dump-schema/src/main/java/eu/dnetlib/dhp/skgif/model/Grant.java +++ b/dump-schema/src/main/java/eu/dnetlib/dhp/skgif/model/Grant.java @@ -158,7 +158,7 @@ public class Grant implements Serializable { this.contributors = contributors; } - public void setGrantCode(String value) { + public void setGrantCode(String value) { grantCode = value; - } + } } diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpDatasource.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpDatasource.java index 94b3861..25d0c74 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpDatasource.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpDatasource.java @@ -112,7 +112,7 @@ public class DumpDatasource implements Serializable { eu.dnetlib.dhp.skgif.model.Datasource datasource = new eu.dnetlib.dhp.skgif.model.Datasource(); Tuple2> first = vs.next(); Datasource d = first._1(); - //datasource.setLocal_identifier(Utils.getIdentifier(Prefixes.DATASOURCE, d.getId())); + // datasource.setLocal_identifier(Utils.getIdentifier(Prefixes.DATASOURCE, d.getId())); datasource.setLocal_identifier(d.getId()); datasource .setIdentifiers( diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpGrant.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpGrant.java index 6dcfb74..b603ee6 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpGrant.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpGrant.java @@ -110,7 +110,7 @@ public class DumpGrant implements Serializable { (MapGroupsFunction>, Grant>) (k, v) -> { Grant g = new Grant(); Tuple2> first = v.next(); - g.setLocal_identifier( k); + g.setLocal_identifier(k); g.setGrantCode(first._1().getCode().getValue()); g.setIdentifiers(getProjectIdentifier(first._1())); g.setTitle(first._1().getTitle().getValue()); diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpOrganization.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpOrganization.java index 5253ed7..2746e3d 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpOrganization.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpOrganization.java @@ -74,7 +74,7 @@ public class DumpOrganization implements Serializable { && !o.getDataInfo().getInvisible()) .map((MapFunction) o -> { eu.dnetlib.dhp.skgif.model.Organization organization = new eu.dnetlib.dhp.skgif.model.Organization(); - //organization.setLocal_identifier(Utils.getIdentifier(Prefixes.ORGANIZATION, o.getId())); + // organization.setLocal_identifier(Utils.getIdentifier(Prefixes.ORGANIZATION, o.getId())); organization.setLocal_identifier(o.getId()); organization .setCountry( diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpResult.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpResult.java index 391b19b..34d4079 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpResult.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/DumpResult.java @@ -289,8 +289,8 @@ public class DumpResult implements Serializable { .setHosting_datasource( MinVenue .newInstance( - //Utils.getIdentifier(Prefixes.DATASOURCE, epm.getInstance().getHostedby().getKey()), - epm.getInstance().getHostedby().getKey(), + // Utils.getIdentifier(Prefixes.DATASOURCE, epm.getInstance().getHostedby().getKey()), + epm.getInstance().getHostedby().getKey(), epm.getInstance().getHostedby().getValue())); return manifestation; diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/EmitFromEntities.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/EmitFromEntities.java index 6fe46e1..8803272 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/EmitFromEntities.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/EmitFromEntities.java @@ -123,8 +123,9 @@ public class EmitFromEntities implements Serializable { .setMinDatsource( MinVenue .newInstance( - //Utils.getIdentifier(Prefixes.DATASOURCE, d.getId()), d.getOfficialname().getValue())); - d.getId(), d.getOfficialname().getValue())); + // Utils.getIdentifier(Prefixes.DATASOURCE, d.getId()), + // d.getOfficialname().getValue())); + d.getId(), d.getOfficialname().getValue())); eme.setEnclosedEntityId(d.getId()); return eme; }, Encoders.bean(EncloseMinElement.class)) @@ -222,8 +223,8 @@ public class EmitFromEntities implements Serializable { .stream() .filter( s -> s.getQualifier().getClassid().equalsIgnoreCase("fos") - //|| s.getQualifier().getClassid().equalsIgnoreCase("sdg")) - ) + // || s.getQualifier().getClassid().equalsIgnoreCase("sdg")) + ) .map(s -> { Topic t = new Topic(); t diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/ResultMapper.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/ResultMapper.java index 86a7794..4b83965 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/ResultMapper.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/ResultMapper.java @@ -27,7 +27,7 @@ public class ResultMapper implements Serializable { Optional ort = Optional.ofNullable(input.getResulttype()); if (ort.isPresent()) { try { - //out.setLocal_identifier(Utils.getIdentifier(Prefixes.RESEARCH_PRODUCT, input.getId())); + // out.setLocal_identifier(Utils.getIdentifier(Prefixes.RESEARCH_PRODUCT, input.getId())); out.setLocal_identifier(input.getId()); mapPid(out, input); mapTitle(out, input); @@ -93,7 +93,7 @@ public class ResultMapper implements Serializable { .getSubject() .stream() .filter( - s -> s.getQualifier().getClassid().equalsIgnoreCase("fos") ) + s -> s.getQualifier().getClassid().equalsIgnoreCase("fos")) // || // s.getQualifier().getClassid().equalsIgnoreCase("sdg")) .map(s -> { diff --git a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/Utils.java b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/Utils.java index 5e2fbd8..0b7a4ea 100644 --- a/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/Utils.java +++ b/dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/skgif/Utils.java @@ -87,14 +87,14 @@ public class Utils implements Serializable { public static MinOrganization getMinOrganization(Organization o) { MinOrganization mo = new MinOrganization(); - //mo.setLocal_identifier(Utils.getIdentifier(Prefixes.ORGANIZATION, o.getId())); + // mo.setLocal_identifier(Utils.getIdentifier(Prefixes.ORGANIZATION, o.getId())); mo.setLocal_identifier(o.getId()); if (Optional.ofNullable(o.getLegalname()).isPresent()) mo.setName(o.getLegalname().getValue()); if (Optional.ofNullable(o.getPid()).isPresent()) for (StructuredProperty pid : o.getPid()) { - if(Optional.ofNullable(pid.getQualifier()).isPresent() && - Optional.ofNullable(pid.getQualifier().getClassid()).isPresent()) + if (Optional.ofNullable(pid.getQualifier()).isPresent() && + Optional.ofNullable(pid.getQualifier().getClassid()).isPresent()) switch (pid.getQualifier().getClassid().toLowerCase()) { case "ror": mo.setRor(pid.getValue()); @@ -119,7 +119,7 @@ public class Utils implements Serializable { public static MinGrant getMinGrant(Project p) throws DocumentException { MinGrant mg = new MinGrant(); - //mg.setLocal_identifier(Utils.getIdentifier(Prefixes.GRANT, p.getId())); + // mg.setLocal_identifier(Utils.getIdentifier(Prefixes.GRANT, p.getId())); mg.setLocal_identifier(p.getId()); if (Optional.ofNullable(p.getCode()).isPresent()) mg.setCode(p.getCode().getValue()); @@ -136,7 +136,7 @@ public class Utils implements Serializable { public static MinProduct getMinProduct(R r) throws JsonProcessingException { MinProduct mp = new MinProduct(); - //mp.setLocal_identifier(Utils.getIdentifier(Prefixes.RESEARCH_PRODUCT, r.getId())); + // mp.setLocal_identifier(Utils.getIdentifier(Prefixes.RESEARCH_PRODUCT, r.getId())); mp.setLocal_identifier(r.getId()); for (StructuredProperty title : r.getTitle()) { if (title.getQualifier().getClassid().equalsIgnoreCase("main title")) { diff --git a/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/skgif/EmitFromEntitiesJobTest.java b/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/skgif/EmitFromEntitiesJobTest.java index 44907be..12df6fc 100644 --- a/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/skgif/EmitFromEntitiesJobTest.java +++ b/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/skgif/EmitFromEntitiesJobTest.java @@ -251,7 +251,7 @@ public class EmitFromEntitiesJobTest { Dataset manifestationDataset = spark .createDataset(manifestation.rdd(), Encoders.bean(EmitPerManifestation.class)); - manifestation.foreach(m-> System.out.println(OBJECT_MAPPER.writeValueAsString(m))); + manifestation.foreach(m -> System.out.println(OBJECT_MAPPER.writeValueAsString(m))); } }