diff --git a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/datacite/hostedBy_map.json b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/datacite/hostedBy_map.json index ecae6811a..9088d2960 100644 --- a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/datacite/hostedBy_map.json +++ b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/datacite/hostedBy_map.json @@ -642,12 +642,12 @@ "PANGAEA.REPOSITORY": { "openaire_id": "re3data_____::r3d100010134", "datacite_name": "PANGAEA", - "official_name": "PANGAEA" + "official_name": "PANGAEA - Data Publisher for Earth and Environmental Science" }, "TIB.PANGAEA": { "openaire_id": "re3data_____::r3d100010134", "datacite_name": "PANGAEA", - "official_name": "PANGAEA" + "official_name": "PANGAEA - Data Publisher for Earth and Environmental Science" }, "NASAPDS.NASAPDS": { "openaire_id": "re3data_____::r3d100010121", diff --git a/dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/sx/bio/BioDBToOAF.scala b/dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/sx/bio/BioDBToOAF.scala index ffdab1799..c5c6026f1 100644 --- a/dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/sx/bio/BioDBToOAF.scala +++ b/dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/sx/bio/BioDBToOAF.scala @@ -82,7 +82,7 @@ object BioDBToOAF { "Springer Nature" ) val EBICollectedFrom: KeyValue = OafMapperUtils.keyValue( - "10|opendoar____::83e60e09c222f206c725385f53d7e567c", + "10|opendoar____::3e60e09c222f206c725385f53d7e567c", "EMBL-EBIs Protein Data Bank in Europe (PDBe)" ) val pubmedCollectedFrom: KeyValue = diff --git a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryOpenOrgsForProvision.sql b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryOpenOrgsForProvision.sql index 133b817d2..87e36d51b 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryOpenOrgsForProvision.sql +++ b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/sql/queryOpenOrgsForProvision.sql @@ -15,7 +15,10 @@ SELECT 'OpenOrgs Database' AS collectedfromname, o.country || '@@@dnet:countries' AS country, 'sysimport:crosswalk:entityregistry@@@dnet:provenance_actions' AS provenanceaction, - array_remove(array_cat(array_agg(DISTINCT i.otherid || '###' || i.type || '@@@dnet:pid_types'), array_agg(DISTINCT idup.otherid || '###' || idup.type || '@@@dnet:pid_types')), NULL) AS pid, + ARRAY(SELECT DISTINCT pid FROM unnest(array_cat( + array_agg(DISTINCT i.otherid || '###' || i.type || '@@@dnet:pid_types'), + array_agg(DISTINCT idup.otherid || '###' || idup.type || '@@@dnet:pid_types') + )) as t(pid) where pid IS NOT NULL) AS pid, (array_remove(array_cat(ARRAY[o.ec_legalbody], array_agg(od.ec_legalbody)), NULL))[1] AS eclegalbody, (array_remove(array_cat(ARRAY[o.ec_legalperson], array_agg(od.ec_legalperson)), NULL))[1] AS eclegalperson, (array_remove(array_cat(ARRAY[o.ec_nonprofit], array_agg(od.ec_nonprofit)), NULL))[1] AS ecnonprofit, @@ -41,4 +44,4 @@ GROUP BY o.name, o.creation_date, o.modification_date, - o.country; \ No newline at end of file + o.country; diff --git a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java index 55b49ee4f..4f9522385 100644 --- a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java +++ b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java @@ -1010,7 +1010,7 @@ class MappersTest { @Test void testD4Science() throws IOException { final String xml = IOUtils - .toString(Objects.requireNonNull(getClass().getResourceAsStream("d4science.xml"))); + .toString(Objects.requireNonNull(getClass().getResourceAsStream("d4science.xml"))); final List actual = new OdfToOafMapper(vocs, false, true).processMdRecord(xml); assertNotNull(actual); assertFalse(actual.isEmpty()); @@ -1023,6 +1023,24 @@ class MappersTest { } + @Test + void testLeiden() throws IOException { + final String xml = IOUtils + .toString(Objects.requireNonNull(getClass().getResourceAsStream("leiden.xml"))); + final List actual = new OdfToOafMapper(vocs, false, true).processMdRecord(xml); + assertNotNull(actual); + assertFalse(actual.isEmpty()); + System.out.println("***************"); + System.out.println(new ObjectMapper().writeValueAsString(actual)); + System.out.println("***************"); + final Publication d = (Publication) actual.get(0); + assertValidId(d.getId()); + assertTrue(StringUtils.isNotBlank(d.getTitle().get(0).getValue())); + assertTrue(StringUtils.isNotBlank(d.getInstance().get(0).getUrl().get(0))); + + } + + private void assertValidId(final String id) { // System.out.println(id); diff --git a/dhp-workflows/dhp-graph-mapper/src/test/resources/eu/dnetlib/dhp/oa/graph/raw/leiden.xml b/dhp-workflows/dhp-graph-mapper/src/test/resources/eu/dnetlib/dhp/oa/graph/raw/leiden.xml new file mode 100644 index 000000000..ac674deb6 --- /dev/null +++ b/dhp-workflows/dhp-graph-mapper/src/test/resources/eu/dnetlib/dhp/oa/graph/raw/leiden.xml @@ -0,0 +1,75 @@ + + +
+ oai:scholarlypublications.universiteitleiden.nl:item_2870593 + 2021-11-03T14:09:07Z + hdl_1887_4540 + hdl_1887_4539 + hdl_1887_26883 + hdl_1887_20765 + open_access + 2023-05-18T01:24:03.623Z + od_______202::0032acf47e4939f8ae28554dfd1240de + 1887/9526 + 2023-03-17T13:30:02.026+01:00 + od_______202 +
+ + + 1887/9526 + + urn:nbn:nl:ui:26-1887/9526 + 22146427 + + + contribution to journal + NA + + open access + Leiden University Non-exclusive license + + + Tweesporenbeleid bij ontwikkeling Afrikaanse curricula: Afrika-Studiecentrum reageert op Peter Crossman + + nl + + application/pdf + + + + Hesseling, G.S.C.M. + G.S.C.M. + Hesseling + 069053138 + Afrika Studiecentrum + + + + 1999 + + + Africa + universities + + + 1887/9526 + urn:nbn:nl:ui:26-1887/9526 + 0038 + 1999-01-01 + OPEN + dut/nld + + + + \ No newline at end of file diff --git a/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/IndexRecordTransformerTest.java b/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/IndexRecordTransformerTest.java index b5a5b5f0d..872bca449 100644 --- a/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/IndexRecordTransformerTest.java +++ b/dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/IndexRecordTransformerTest.java @@ -128,6 +128,12 @@ public class IndexRecordTransformerTest { testRecordTransformation(record); } + @Test + public void testForEOSCFutureSentinel() throws IOException, TransformerException { + final String record = IOUtils.toString(getClass().getResourceAsStream("eosc-future/sentinel.xml")); + testRecordTransformation(record); + } + @Test public void testForEdithDemo() throws IOException, TransformerException { final String record = IOUtils.toString(getClass().getResourceAsStream("edith-demo/10.1098-rsta.2020.0257.xml")); diff --git a/dhp-workflows/dhp-graph-provision/src/test/resources/eu/dnetlib/dhp/oa/provision/eosc-future/sentinel.xml b/dhp-workflows/dhp-graph-provision/src/test/resources/eu/dnetlib/dhp/oa/provision/eosc-future/sentinel.xml new file mode 100644 index 000000000..475a375d3 --- /dev/null +++ b/dhp-workflows/dhp-graph-provision/src/test/resources/eu/dnetlib/dhp/oa/provision/eosc-future/sentinel.xml @@ -0,0 +1,138 @@ + + +
+ doi_dedup___::10a910f4a66b7f4bce8407d7a486a80a + 2023-04-05T00:36:27+0000 + 2023-04-05T07:33:52.185Z +
+ + + + + + 50|datacite____::10a910f4a66b7f4bce8407d7a486a80a + 10.5281/zenodo.6967373 + 50|datacite____::172969c66c312a9656fc745f0ec62ce5 + 10.5281/zenodo.6969999 + 50|datacite____::4fa8f1c89ff11e8e99f9ded870ade80d + 10.5281/zenodo.6967372 + 50|datacite____::a466b6173773d742b7a5881682748a8c + 10.5281/zenodo.6970067 + 10.5281/zenodo.6967373 + 10.5281/zenodo.6969999 + 10.5281/zenodo.6967372 + 10.5281/zenodo.6970067 + Sentinel-3 NDVI ARD and Long Term Statistics (1999-2019) from the Copernicus Global Land Service over Lombardia + + Marasco Pier Lorenzo + 2022-08-05 + Sentinel-3 NDVI Analysis Ready Data (ARD) (C_GLS_NDVI_20220101_20220701_Lombardia_S3_2.nc) product provided by the Copernicus Global Land Service [3]. The file C_GLS_NDVI_20220101_20220701_Lombardia_S3_2_masked.nc is derived from C_GLS_NDVI_20220101_20220701_Lombardia_S3_2.nc but values have been scaled (raw_value * ( 1/250) - 0.08) and values lower then -0.08 and greater than 0.92 have been removed (set to missing values). The original dataset can also be discovered through the OpenEO API[5] from the CGLS distributor VITO [4]. Access is free of charge but an EGI registration is needed. The file called Italy.geojson has been created using the Global Administrative Unit Layers GAUL G2015_2014 provided by FAO-UN (see Documentation). It only contains information related to Italy. Further info about drought indexes can be found in the Integrated Drought Management Programme [5] [1] Application of vegetation index and brightness temperature for drought detection [2] NDVI [3] Copernicus Global Land Service [4] Vito [5] OpenEO [5] Integrated Drought Management + These datasets are used for training purposes. See https://pangeo-data.github.io/foss4g-2022/intro.html + NDVI + vegetaion + Copernicus Global Land Service + pangeo + + 2022-08-05 + Zenodo + + + + + true + false + 0.8 + dedup-result-decisiontree-v3 + + + + + + Zenodo + 10.5281/zenodo.6967372 + 2022-08-05 + + Sentinel-3 NDVI ARD and Long Term Statistics (1999-2019) from the Copernicus Global Land Service over Lombardia + + + Zenodo + 10.5281/zenodo.6970067 + 2022-08-05 + + Sentinel-3 NDVI ARD and Long Term Statistics (1999-2019) from the Copernicus Global Land Service over Lombardia + + + Zenodo + 2022-08-05 + 10.5281/zenodo.6969999 + + Sentinel-3 NDVI ARD and Long Term Statistics (1999-2019) from the Copernicus Global Land Service over Lombardia + + + Zenodo + 2022-08-05 + + Sentinel-3 NDVI ARD and Long Term Statistics (1999-2019) from the Copernicus Global Land Service over Lombardia + 10.5281/zenodo.6967373 + + + + + + 2022-08-05 + + 10.5281/zenodo.6967373 + + https://creativecommons.org/licenses/by/4.0/legalcode + + https://doi.org/10.5281/zenodo.6967373 + + + + + + + 2022-08-05 + + 10.5281/zenodo.6970067 + + https://creativecommons.org/licenses/by/4.0/legalcode + + https://doi.org/10.5281/zenodo.6970067 + + + + + + + 2022-08-05 + + 10.5281/zenodo.6969999 + + https://creativecommons.org/licenses/by/4.0/legalcode + + https://doi.org/10.5281/zenodo.6969999 + + + + + + + 2022-08-05 + + 10.5281/zenodo.6967372 + + https://creativecommons.org/licenses/by/4.0/legalcode + + https://doi.org/10.5281/zenodo.6967372 + + + + + + + + \ No newline at end of file