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 bfeeb80ac..f7de61ad7 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 @@ -188,7 +188,7 @@ base_dc:link (I used dc:identifier) - + @@ -233,10 +233,12 @@ 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 007e8c93e..c722c9138 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 @@ -66,7 +66,7 @@ + select="distinct-values(//dc:identifier[starts-with(., 'http') and (not(contains(., '://dx.doi.org/') or contains(., '://doi.org/') or contains(., '://hdl.handle.net/')))])"> @@ -110,7 +110,7 @@ - + @@ -175,14 +175,12 @@ - - - open access - - - - - + + open access + + + + @@ -209,18 +207,14 @@ - - OPEN - + OPEN - - UNKNOWN - + UNKNOWN @@ -231,7 +225,7 @@ + select="distinct-values(//dc:identifier[starts-with(., 'http') and ( not(contains(., '://dx.doi.org/') or contains(., '://doi.org/') or contains(., '://hdl.handle.net/')))])"> @@ -276,10 +270,13 @@ - - - - + + + + + + + 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 8ab717ca8..766a5a0bd 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 @@ -7,6 +7,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; @@ -18,6 +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 @ExtendWith(MockitoExtension.class) public class BaseTransfomationTest extends AbstractVocabularyTest { @@ -47,6 +49,20 @@ public class BaseTransfomationTest extends AbstractVocabularyTest { System.out.println(result.getBody()); } + @Test + void testBase2OAF() throws Exception { + + final MetadataRecord mr = new MetadataRecord(); + mr.setProvenance(new Provenance("DSID", "DSNAME", "PREFIX")); + mr.setBody(IOUtils.toString(getClass().getResourceAsStream("record.xml"))); + + final XSLTTransformationFunction tr = loadTransformationRule("xml/base2oaf.transformationRule.xml"); + + final MetadataRecord result = tr.call(mr); + + System.out.println(result.getBody()); + } + private XSLTTransformationFunction loadTransformationRule(final String path) throws Exception { final String xslt = new SAXReader() .read(this.getClass().getResourceAsStream(path)) diff --git a/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/collection/plugin/base/record.xml b/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/collection/plugin/base/record.xml index 8f0f505fd..9c58941fd 100644 --- a/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/collection/plugin/base/record.xml +++ b/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/collection/plugin/base/record.xml @@ -1,31 +1,58 @@
- ftterritoryanzac:oai:www.territorystories.nt.gov.au:10070/74188 - 2015-09-07T22:26:28Z + ftdoajarticles:oai:doaj.org/article:e2d5b5126b2d4e479933cc7f9a9ae0c1 + 2022-12-31T11:48:55Z
- ftterritoryanzac:oai:www.territorystories.nt.gov.au:10070/74188 - cau - au - ftterritoryanzac - Territory Stories (Northern Territory Government, Australia) - W. Wardle - Wardle, W. - "NX 112520 Bdr. W. Wardle Darwin Coast Art. 1943-45" ; NX 112520. Bombardier W. Wardle. Darwin Coast Artillery. 1943-1945. - 2007-12-18T01:19:36Z - 2007 - Image - Reference - 51 - Cropped 408w X 338h Size 26.62k - http://hdl.handle.net/10070/74188 - http://hdl.handle.net/10070/74188 - Darwin Commemorative Wall Quilt - http://www.ww2roll.gov.au/script/veteran.asp?ServiceID=A&VeteranID=220307 - http://hdl.handle.net/10070/74188 + ftdoajarticles:oai:doaj.org/article:e2d5b5126b2d4e479933cc7f9a9ae0c1 + cww + org + ftdoajarticles + TEST REPO + Assessment of cultural heritage: the legislative and methodological framework of Russian Federation + ALBU, Svetlana + LEȘAN, Anna + architectural heritage + evaluation of architectural heritage + types of values + experience of russian federation + Social Sciences + H + Architectural heritage is the real estate inheritance by population of a country becoming an extremely valuable and specific category, preserving and capitalizing on those assets requires considerable effort. The state does not have sufficient means to maintain and preserve cultural heritage, as a result it is included in the civil circuit. The transfer of property right or of some partial rights over the architectural patrimony is accompanied by the necessity to estimate the value of goods. In this article, the authors examine the experience of Russian Federation (one of the largest countries with a huge architectural heritage) on the legislative framework of architectural and methodological heritage of architectural heritage assessment. The particularities of cultural assets valuation compared to other categories of real estate are examined, as well as the methodological aspects (types of values, methods applied in valuation, approaches according to the purpose of valuation) regarding the valuation of real estate with architectural value in Russian Federation. + Technical University of Moldova + 2020-09-01T00:00:00Z + 2020 + article + 121 + https://doi.org/10.5281/zenodo.3971988 + https://doaj.org/article/e2d5b5126b2d4e479933cc7f9a9ae0c1 + https://doi.org/10.5281/zenodo.3971988 + Journal of Social Sciences, Vol 3, Iss 3, Pp 134-143 (2020) + EN + FR + RO + http://ibn.idsi.md/sites/default/files/imag_file/JSS-3-2020_134-143.pdf + https://doaj.org/toc/2587-3490 + https://doaj.org/toc/2587-3504 + doi:10.5281/zenodo.3971988 + 2587-3490 + 2587-3504 + https://doaj.org/article/e2d5b5126b2d4e479933cc7f9a9ae0c1 + 720 + + ALBU, Svetlana + https://orcid.org/0000-0002-8648-950X + + + LEȘAN, Anna + https://orcid.org/0000-0003-3284-0525 + + https://doi.org/10.5281/zenodo.3971988 1 - unknown + eng + fre + rum -
\ No newline at end of file + diff --git a/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/transform/synonyms.txt b/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/transform/synonyms.txt index 74a75e46a..6b7979a6b 100644 --- a/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/transform/synonyms.txt +++ b/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/transform/synonyms.txt @@ -1496,4 +1496,30 @@ cnr:institutes @=@ __CDS131__ @=@ IBE - Istituto per la BioEconomia cnr:institutes @=@ https://ror.org/0263zy895 @=@ CDS132 cnr:institutes @=@ https://ror.org/0263zy895 @=@ SCITEC - Istituto di Scienze e Tecnologie Chimiche \"Giulio Natta\" cnr:institutes @=@ __CDS133__ @=@ CDS133 -cnr:institutes @=@ __CDS133__ @=@ STEMS - Istituto di Scienze e Tecnologie per l'Energia e la Mobilità Sostenibili \ No newline at end of file +cnr:institutes @=@ __CDS133__ @=@ STEMS - Istituto di Scienze e Tecnologie per l'Energia e la Mobilità Sostenibili +base:normalized_types @=@ Text @=@ 1 +base:normalized_types @=@ Book @=@ 11 +base:normalized_types @=@ Book part @=@ 111 +base:normalized_types @=@ Journal/Newspaper @=@ 12 +base:normalized_types @=@ Article contribution @=@ 121 +base:normalized_types @=@ Other non-article @=@ 122 +base:normalized_types @=@ Conference object @=@ 13 +base:normalized_types @=@ Report @=@ 14 +base:normalized_types @=@ Review @=@ 15 +base:normalized_types @=@ Course material @=@ 16 +base:normalized_types @=@ Lecture @=@ 17 +base:normalized_types @=@ Thesis @=@ 18 +base:normalized_types @=@ Bachelor's thesis @=@ 181 +base:normalized_types @=@ Master's thesis @=@ 182 +base:normalized_types @=@ Doctoral and postdoctoral thesis @=@ 183 +base:normalized_types @=@ Manuscript @=@ 19 +base:normalized_types @=@ Patent @=@ 1A +base:normalized_types @=@ Musical notation @=@ 2 +base:normalized_types @=@ Map @=@ 3 +base:normalized_types @=@ Audio @=@ 4 +base:normalized_types @=@ Image/Video @=@ 5 +base:normalized_types @=@ Still image @=@ 51 +base:normalized_types @=@ Moving image/Video @=@ 52 +base:normalized_types @=@ Software @=@ 6 +base:normalized_types @=@ Dataset @=@ 7 +base:normalized_types @=@ Unknown @=@ F diff --git a/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/transform/terms.txt b/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/transform/terms.txt index 0f0ebaad4..29e42ffd9 100644 --- a/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/transform/terms.txt +++ b/dhp-workflows/dhp-aggregation/src/test/resources/eu/dnetlib/dhp/transform/terms.txt @@ -1210,4 +1210,29 @@ cnr:institutes @=@ cnr:institutes @=@ __CDS130__ @=@ __CDS130__ cnr:institutes @=@ cnr:institutes @=@ __CDS131__ @=@ __CDS131__ cnr:institutes @=@ cnr:institutes @=@ https://ror.org/0263zy895 @=@ https://ror.org/0263zy895 cnr:institutes @=@ cnr:institutes @=@ __CDS133__ @=@ __CDS133__ - +base:normalized_types @=@ base:normalized_types @=@ Text @=@ Text +base:normalized_types @=@ base:normalized_types @=@ Book @=@ Book +base:normalized_types @=@ base:normalized_types @=@ Book part @=@ Book part +base:normalized_types @=@ base:normalized_types @=@ Journal/Newspaper @=@ Journal/Newspaper +base:normalized_types @=@ base:normalized_types @=@ Article contribution @=@ Article contribution +base:normalized_types @=@ base:normalized_types @=@ Other non-article @=@ Other non-article +base:normalized_types @=@ base:normalized_types @=@ Conference object @=@ Conference object +base:normalized_types @=@ base:normalized_types @=@ Report @=@ Report +base:normalized_types @=@ base:normalized_types @=@ Review @=@ Review +base:normalized_types @=@ base:normalized_types @=@ Course material @=@ Course material +base:normalized_types @=@ base:normalized_types @=@ Lecture @=@ Lecture +base:normalized_types @=@ base:normalized_types @=@ Thesis @=@ Thesis +base:normalized_types @=@ base:normalized_types @=@ Bachelor's thesis @=@ Bachelor's thesis +base:normalized_types @=@ base:normalized_types @=@ Master's thesis @=@ Master's thesis +base:normalized_types @=@ base:normalized_types @=@ Doctoral and postdoctoral thesis @=@ Doctoral and postdoctoral thesis +base:normalized_types @=@ base:normalized_types @=@ Manuscript @=@ Manuscript +base:normalized_types @=@ base:normalized_types @=@ Patent @=@ Patent +base:normalized_types @=@ base:normalized_types @=@ Musical notation @=@ Musical notation +base:normalized_types @=@ base:normalized_types @=@ Map @=@ Map +base:normalized_types @=@ base:normalized_types @=@ Audio @=@ Audio +base:normalized_types @=@ base:normalized_types @=@ Image/Video @=@ Image/Video +base:normalized_types @=@ base:normalized_types @=@ Still image @=@ Still image +base:normalized_types @=@ base:normalized_types @=@ Moving image/Video @=@ Moving image/Video +base:normalized_types @=@ base:normalized_types @=@ Software @=@ Software +base:normalized_types @=@ base:normalized_types @=@ Dataset @=@ Dataset +base:normalized_types @=@ base:normalized_types @=@ Unknown @=@ Unknown \ No newline at end of file