diff --git a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2oaf.transformationRule.xml b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2oaf.transformationRule.xml index 7a09fec2e..58e932085 100644 --- a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2oaf.transformationRule.xml +++ b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2oaf.transformationRule.xml @@ -59,7 +59,6 @@ base_dc:global_id (I used oai:identifier) base_dc:collection/text() base_dc:continent -base_dc:country base_dc:year (I used dc:date) dc:coverage dc:language (I used base_dc:lang) @@ -254,8 +253,13 @@ base_dc:link (I used dc:identifier) - + + + + + + diff --git a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2odf.transformationRule.xml b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2odf.transformationRule.xml index 917a351b3..6e6b2ee11 100644 --- a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2odf.transformationRule.xml +++ b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2odf.transformationRule.xml @@ -42,7 +42,6 @@ base_dc:global_id (I used oai:identifier) base_dc:collection/text() base_dc:continent - base_dc:country dc:coverage dc:source dc:relation @@ -290,6 +289,11 @@ + + + + + diff --git a/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collection/plugin/base/BaseTransfomationTest.java b/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collection/plugin/base/BaseTransfomationTest.java index f4539014d..2bbd87117 100644 --- a/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collection/plugin/base/BaseTransfomationTest.java +++ b/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collection/plugin/base/BaseTransfomationTest.java @@ -8,7 +8,6 @@ import org.apache.spark.SparkConf; import org.apache.spark.util.LongAccumulator; import org.dom4j.io.SAXReader; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; @@ -20,7 +19,7 @@ import eu.dnetlib.dhp.schema.mdstore.Provenance; import eu.dnetlib.dhp.transformation.xslt.XSLTTransformationFunction; import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException; -@Disabled +// @Disabled @ExtendWith(MockitoExtension.class) public class BaseTransfomationTest extends AbstractVocabularyTest { @@ -66,9 +65,9 @@ public class BaseTransfomationTest extends AbstractVocabularyTest { private XSLTTransformationFunction loadTransformationRule(final String path) throws Exception { final String xslt = new SAXReader() - .read(this.getClass().getResourceAsStream(path)) - .selectSingleNode("//CODE/*") - .asXML(); + .read(this.getClass().getResourceAsStream(path)) + .selectSingleNode("//CODE/*") + .asXML(); final LongAccumulator la = new LongAccumulator();