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..cee649805 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 @@ -66,10 +66,6 @@ dc:language (I used base_dc:lang) base_dc:link (I used dc:identifier) --> - - - - @@ -112,9 +108,13 @@ base_dc:link (I used dc:identifier) - - - + + + + + + + @@ -162,12 +162,144 @@ base_dc:link (I used dc:identifier) - - - - - - + + + + + + 0013 + + + + + 0002 + + + + + 0001 + + + + + + 0043 + + + + + 0017 + + + + + 0015 + + + + + 0010 + + + + + 0008 + + + + + 0007 + + + + + 0006 + + + + + 0044 + + + + + 0019 + + + + + 0001 + + + + + 0029 + + + + + 0021 + + + + + 0025 + + + + + 0024 + + + + + 0033 + + + + + 0030 + + + + + 0020 + + + + + 0020 + + + + + 0038 + + + + + 0038 + + + + + 0038 + + + + + 0004 + + + + + 0000 + + + 0000 + + + 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..4565b81f5 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 @@ -51,10 +51,6 @@ base_dc:link (I used dc:identifier) --> - - - - @@ -93,7 +89,9 @@ - + + + @@ -185,26 +183,157 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + 0013 + + + + + 0002 + + + + + 0001 + + + + + + 0043 + + + + + 0017 + + + + + 0015 + + + + + 0010 + + + + + 0008 + + + + + 0007 + + + + + 0006 + + + + + 0044 + + + + + 0019 + + + + + 0001 + + + + + 0029 + + + + + 0021 + + + + + 0025 + + + + + 0024 + + + + + 0033 + + + + 0030 + + + + + 0020 + + + + + 0020 + + + + + 0038 + + + + + 0038 + + + + + 0038 + + + + + 0004 + + + + + 0000 + + + 0000 + + + OPEN 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();