dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2oaf.transformationRule.xml

@@ -59,6 +59,7 @@ 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)
@@ -253,13 +254,8 @@ base_dc:link (I used dc:identifier)
 													<xsl:value-of select="concat('ror_________::https://ror.org/', normalize-space(.))" />
 												</xsl:otherwise>
 											</xsl:choose>
-										</oaf:relation>										
+										</oaf:relation>
 									</xsl:for-each>
-
-									<xsl:for-each select="//base_dc:country">
-										<oaf:country><xsl:value-of select="vocabulary:clean(., 'dnet:countries')" /></oaf:country>
-									</xsl:for-each>
-									
 								</metadata>
 								<xsl:copy-of select="//*[local-name() = 'about']" />
 							</record>

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2odf.transformationRule.xml

@@ -42,6 +42,7 @@
 									base_dc:global_id (I used oai:identifier) 
 									base_dc:collection/text() 
 									base_dc:continent 
+									base_dc:country  
 									dc:coverage
 									dc:source
 									dc:relation
@@ -289,11 +290,6 @@
 											</xsl:choose>
 										</oaf:relation>
 									</xsl:for-each>
-									
-									<xsl:for-each select="//base_dc:country">
-										<oaf:country><xsl:value-of select="vocabulary:clean(., 'dnet:countries')" /></oaf:country>
-									</xsl:for-each>
-									
 								</metadata>
 								<xsl:copy-of select="//*[local-name() = 'about']" />
 							</record>

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collection/plugin/base/BaseTransfomationTest.java

@@ -8,6 +8,7 @@ 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;
@@ -19,7 +20,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 {
 
@@ -65,9 +66,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();