lsmyrnaios
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'beta' into clean_country

This commit is contained in:
Claudio Atzori 2022-09-09 12:20:19 +02:00
parent 14dc909a14 690be4482f
commit b5d6966c01
3 changed files with 35 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/OdfToOafMapper.java
View File

@ -25,7 +25,8 @@ import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
public class OdfToOafMapper extends AbstractMdRecordToOafMapper { public class OdfToOafMapper extends AbstractMdRecordToOafMapper {
public static final String HTTP_DX_DOI_PREIFX = "https://dx.doi.org/"; public static final String HTTP_DOI_PREIFX = "https://doi.org/";
public static final String HTTP_HANDLE_PREIFX = "https://hdl.handle.net/";
public OdfToOafMapper(final VocabularyGroup vocs, final boolean invisible, final boolean shouldHashId, public OdfToOafMapper(final VocabularyGroup vocs, final boolean invisible, final boolean shouldHashId,
final boolean forceOrginalId) { final boolean forceOrginalId) {
@ -172,10 +173,17 @@ public class OdfToOafMapper extends AbstractMdRecordToOafMapper {
} }
for (final Object o : doc for (final Object o : doc
.selectNodes("//*[local-name()='alternateIdentifier' and ./@alternateIdentifierType='DOI']")) { .selectNodes("//*[local-name()='alternateIdentifier' and ./@alternateIdentifierType='DOI']")) {
url.add(HTTP_DX_DOI_PREIFX + ((Node) o).getText().trim()); url.add(HTTP_DOI_PREIFX + ((Node) o).getText().trim());
} }
for (final Object o : doc.selectNodes("//*[local-name()='identifier' and ./@identifierType='DOI']")) { for (final Object o : doc.selectNodes("//*[local-name()='identifier' and ./@identifierType='DOI']")) {
url.add(HTTP_DX_DOI_PREIFX + ((Node) o).getText().trim()); url.add(HTTP_DOI_PREIFX + ((Node) o).getText().trim());
}
for (final Object o : doc
.selectNodes("//*[local-name()='alternateIdentifier' and ./@alternateIdentifierType='Handle']")) {
url.add(HTTP_HANDLE_PREIFX + ((Node) o).getText().trim());
}
for (final Object o : doc.selectNodes("//*[local-name()='identifier' and ./@identifierType='Handle']")) {
url.add(HTTP_HANDLE_PREIFX + ((Node) o).getText().trim());
} }
if (!url.isEmpty()) { if (!url.isEmpty()) {
instance.setUrl(new ArrayList<>()); instance.setUrl(new ArrayList<>());

3
dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
View File

@ -942,6 +942,9 @@ class MappersTest {
System.out.println("***************"); System.out.println("***************");
System.out.println(new ObjectMapper().writeValueAsString(list)); System.out.println(new ObjectMapper().writeValueAsString(list));
System.out.println("***************"); System.out.println("***************");
final Publication p = (Publication) list.get(0);
assertNotNull(p.getInstance().get(0).getUrl().get(0));
} }
private void assertValidId(final String id) { private void assertValidId(final String id) {

64
dhp-workflows/dhp-graph-mapper/src/test/resources/eu/dnetlib/dhp/oa/graph/raw/riunet.xml
View File

@ -21,72 +21,50 @@
</header> </header>
<metadata> <metadata>
<datacite:resource> <datacite:resource>
<datacite:identifier identifierType="DOI">10.4995/ijpme.2020.12944</datacite:identifier> <datacite:identifier identifierType="Handle">10251/178464</datacite:identifier>
<datacite:alternateIdentifiers> <datacite:alternateIdentifiers/>
<datacite:alternateIdentifier alternateIdentifierType="Handle">10251/148537</datacite:alternateIdentifier>
</datacite:alternateIdentifiers>
<datacite:relatedIdentifiers/> <datacite:relatedIdentifiers/>
<datacite:resourceType xs:anyURI="http://purl.org/coar/resource_type/c_6501">journal article</datacite:resourceType> <datacite:resourceType xs:anyURI="http://purl.org/coar/resource_type/c_8544">lecture</datacite:resourceType>
<datacite:version>VoR</datacite:version>
<datacite:rightsList> <datacite:rightsList>
<datacite:rights rightsURI=" http://creativecommons.org/licenses/by-nc-nd/4.0/">http://creativecommons.org/licenses/by-nc-nd/4.0/</datacite:rights> <datacite:rights rightsURI=" http://creativecommons.org/licenses/by-nc/4.0/">http://creativecommons.org/licenses/by-nc/4.0/</datacite:rights>
<datacite:rights rightsURI="http://purl.org/coar/access_right/c_abf2">open access</datacite:rights> <datacite:rights rightsURI="http://purl.org/coar/access_right/c_abf2">open access</datacite:rights>
</datacite:rightsList> </datacite:rightsList>
<datacite:titles> <datacite:titles>
<datacite:title>Production planning in 3D printing factories</datacite:title> <datacite:title>Discurso de inauguración del curso academico 1990-1991 de la Universitat Politècnica de València</datacite:title>
</datacite:titles> </datacite:titles>
<datacite:descriptions> <datacite:descriptions>
<datacite:description descriptionType="Abstract">[EN] Production planning in 3D printing factories brings new challenges among which the scheduling of parts to be produced stands out. A main issue is to increase the efficiency of the plant and 3D printers productivity. Planning, scheduling, and nesting in 3D printing are recurrent problems in the search for new techniques to promote the development of this technology. In this work, we address the problem for the suppliers that have to schedule their daily production. This problem is part of the LONJA3D model, a managed 3D printing market where the parts ordered by the customers are reorganized into new batches so that suppliers can optimize their production capacity. In this paper, we propose a method derived from the design of combinatorial auctions to solve the nesting problem in 3D printing. First, we propose the use of a heuristic to create potential manufacturing batches. Then, we compute the expected return for each batch. The selected batch should generate the highest income. Several experiments have been tested to validate the process. This method is a first approach to the planning problem in 3D printing and further research is proposed to improve the procedure.</datacite:description> <datacite:description descriptionType="Abstract">[ES] Discurso de Justo Nieto en el acto de inauguración del curso académico 1990-1991</datacite:description>
<datacite:description descriptionType="Abstract">This research has been partially financed by the project: “Lonja de Impresión 3D para la Industria 4.0 y la Empresa Digital (LONJA3D)” funded by the Regional Government of Castile and Leon and the European Regional Development Fund (ERDF, FEDER) with grant VA049P17.</datacite:description> <datacite:description descriptionType="Abstract">[EN] Inaugural speech by Justo Nieto at the opening ceremony of the 1990-1991 academic year</datacite:description>
</datacite:descriptions> </datacite:descriptions>
<datacite:language>eng</datacite:language> <datacite:language>spa</datacite:language>
<datacite:publisher>Universitat Politècnica de València</datacite:publisher>
<datacite:formats> <datacite:formats>
<datacite:format>application/pdf</datacite:format> <datacite:format>application/pdf</datacite:format>
<datacite:format>716912</datacite:format> <datacite:format>5055377</datacite:format>
</datacite:formats> </datacite:formats>
<datacite:fundingReferences>
<datacite:fundingReference>
<datacite:funderName>Junta de Castilla y León</datacite:funderName>
<datacite:funderIdentifier funderIdentifierType="Crossref Funder ID">http://dx.doi.org/10.13039/501100014180</datacite:funderIdentifier>
<datacite:awardNumber>VA049P17</datacite:awardNumber>
</datacite:fundingReference>
</datacite:fundingReferences>
<datacite:creators> <datacite:creators>
<datacite:creator> <datacite:creator>
<datacite:creatorName>De Antón, J.</datacite:creatorName> <datacite:creatorName>Nieto Nieto, Justo</datacite:creatorName>
</datacite:creator>
<datacite:creator>
<datacite:creatorName>Senovilla, J.</datacite:creatorName>
</datacite:creator>
<datacite:creator>
<datacite:creatorName>González, J.M.</datacite:creatorName>
</datacite:creator>
<datacite:creator>
<datacite:creatorName>Acebes, F.</datacite:creatorName>
</datacite:creator>
<datacite:creator>
<datacite:creatorName>Pajares, J.</datacite:creatorName>
</datacite:creator> </datacite:creator>
</datacite:creators> </datacite:creators>
<datacite:contributors/> <datacite:contributors/>
<datacite:dates> <datacite:dates>
<datacite:date dateType="Issued">2020-07-18</datacite:date> <datacite:date dateType="Issued">1991</datacite:date>
</datacite:dates> </datacite:dates>
<datacite:subjects> <datacite:subjects>
<datacite:subject>Additive manufacturing</datacite:subject> <datacite:subject>Justo Nieto Nieto (Discursos)</datacite:subject>
<datacite:subject>Production planning</datacite:subject> <datacite:subject>Universitat Politècnica de València (UPV)</datacite:subject>
<datacite:subject>Packing problem</datacite:subject> <datacite:subject>Presentación inaugural</datacite:subject>
<datacite:subject>Optimization</datacite:subject> <datacite:subject>Curso académico 1990-91</datacite:subject>
<datacite:subject>Nesting</datacite:subject> <datacite:subject>Discurso inaugural</datacite:subject>
<datacite:subject>Inaugural speech</datacite:subject>
<datacite:subject>Inaugural presentation</datacite:subject>
</datacite:subjects> </datacite:subjects>
</datacite:resource> </datacite:resource>
<oaf:identifier identifierType="DOI">10.4995/ijpme.2020.12944</oaf:identifier> <oaf:identifier identifierType="Handle">10251/178464</oaf:identifier>
<oaf:identifier identifierType="Handle">10251/148537</oaf:identifier>
<dr:CobjCategory type="publication">0038</dr:CobjCategory> <dr:CobjCategory type="publication">0038</dr:CobjCategory>
<oaf:dateAccepted>2020-07-18</oaf:dateAccepted> <oaf:dateAccepted>1991-01-01</oaf:dateAccepted>
<oaf:accessrights>OPEN</oaf:accessrights> <oaf:accessrights>OPEN</oaf:accessrights>
<oaf:language>eng</oaf:language> <oaf:language>spa</oaf:language>
<oaf:hostedBy name="RiuNet" id="opendoar____::1560"/> <oaf:hostedBy name="RiuNet" id="opendoar____::1560"/>
<oaf:collectedFrom name="RiuNet" id="opendoar____::1560"/> <oaf:collectedFrom name="RiuNet" id="opendoar____::1560"/>
</metadata> </metadata>