diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ARUP/ordered_sparql_insert_arup.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ARUP/ordered_sparql_insert_arup.sparql index 0fc8adb..5b1a081 100644 --- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ARUP/ordered_sparql_insert_arup.sparql +++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ARUP/ordered_sparql_insert_arup.sparql @@ -812,6 +812,20 @@ WHERE { } }; +PREFIX aocat: +PREFIX skos: +INSERT { + GRAPH { + ?s owl:sameAs ?patched_ns . + } +} +WHERE { + GRAPH { + ?s owl:sameAs ?ns . + } + bind(iri(replace(str(?ns),"AMCR","AIS%20CR")) as ?patched_ns) +}; + PREFIX aocat: PREFIX skos: INSERT { diff --git a/dnet-ariadneplus-graphdb-publisher/test/java/eu/dnetlib/ariadneplus/GraphDbReaderAndESIndexTest.java b/dnet-ariadneplus-graphdb-publisher/test/java/eu/dnetlib/ariadneplus/GraphDbReaderAndESIndexTest.java index adac55a..4baa51f 100644 --- a/dnet-ariadneplus-graphdb-publisher/test/java/eu/dnetlib/ariadneplus/GraphDbReaderAndESIndexTest.java +++ b/dnet-ariadneplus-graphdb-publisher/test/java/eu/dnetlib/ariadneplus/GraphDbReaderAndESIndexTest.java @@ -35,7 +35,17 @@ public class GraphDbReaderAndESIndexTest { @Ignore public void uploadAMCRFieldworkTest() throws Exception { boolean isRecord = true; - String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AMCR/E61E0F4E-268F-39E4-8EDB-A431AFC505AA"; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AIS%20CR/E61E0F4E-268F-39E4-8EDB-A431AFC505AA"; + String datasource = "amcr"; + String collectionId = "oai"; + readAndIndexTest(isRecord, recordId, datasource, collectionId); + } + + @Test +// @Ignore + public void uploadAMCRFieldworkEventOnlyPeriodoTest() throws Exception { + boolean isRecord = true; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AIS%20CR/849F814F-5892-3408-AD5E-904938B4492A"; String datasource = "amcr"; String collectionId = "oai"; readAndIndexTest(isRecord, recordId, datasource, collectionId); @@ -45,17 +55,17 @@ public class GraphDbReaderAndESIndexTest { @Ignore public void uploadAMCRDocumentTest() throws Exception { boolean isRecord = true; - String recordId = "https://ariadne-infrastructure.eu/aocat/Collection/AMCR/FC59581D-DC3A-31DA-922A-98DE764F3D76"; + String recordId = "https://ariadne-infrastructure.eu/aocat/Collection/AIS%20CR/FC59581D-DC3A-31DA-922A-98DE764F3D76"; String datasource = "amcr"; String collectionId = "oai"; readAndIndexTest(isRecord, recordId, datasource, collectionId); } @Test - @Ignore +// @Ignore public void uploadAMCRSiteTest() throws Exception { boolean isRecord = true; - String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AMCR/3C7EC936-A7CA-3720-B3DC-413A25754FD4"; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AIS%20CR/3C7EC936-A7CA-3720-B3DC-413A25754FD4"; String datasource = "amcr"; String collectionId = "oai"; readAndIndexTest(isRecord, recordId, datasource, collectionId); @@ -65,7 +75,7 @@ public class GraphDbReaderAndESIndexTest { @Ignore public void uploadAMCRIndividualFindTest() throws Exception { boolean isRecord = true; - String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AMCR/98D717C4-410F-35C6-8072-FABA7686B4A3"; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AIS%20CR/98D717C4-410F-35C6-8072-FABA7686B4A3"; String datasource = "amcr"; String collectionId = "oai"; readAndIndexTest(isRecord, recordId, datasource, collectionId); @@ -192,7 +202,7 @@ public class GraphDbReaderAndESIndexTest { } @Test -// @Ignore + @Ignore public void uploadROADTest() throws Exception { boolean isRecord = true; String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/FC70B370-C489-31C5-B1D4-339CFD28CF2B"; @@ -201,6 +211,56 @@ public class GraphDbReaderAndESIndexTest { readAndIndexTest(isRecord, recordId, datasource, collectionId); } + @Test + @Ignore + public void uploadFastiTest() throws Exception { + boolean isRecord = true; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/FASTIONLINE/532D492C-B141-30D0-886A-1E69C2C20474"; + String datasource = "fasti"; + String collectionId = "fieldwork"; + readAndIndexTest(isRecord, recordId, datasource, collectionId); + } + + @Test +// @Ignore + public void uploadNaraTest() throws Exception { + boolean isRecord = true; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/145E8675-8188-3650-9B98-222CA3C04EFA"; + String datasource = "nara"; + String collectionId = "fieldworkreport"; + readAndIndexTest(isRecord, recordId, datasource, collectionId); + } + + @Test +// @Ignore + public void uploadDansClosedAccessTest() throws Exception { + boolean isRecord = true; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/D1C1D6AD-320D-3616-B75D-F2E2C3DA7F3E"; + String datasource = "dans"; + String collectionId = "easy"; + readAndIndexTest(isRecord, recordId, datasource, collectionId); + } + + @Test +// @Ignore + public void uploadDansRestrictedAccessTest() throws Exception { + boolean isRecord = true; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/221AAEC8-CC9B-310C-B800-0DFE34850E0B"; + String datasource = "dans"; + String collectionId = "easy"; + readAndIndexTest(isRecord, recordId, datasource, collectionId); + } + + @Test +// @Ignore + public void uploadDansOpenAccessTest() throws Exception { + boolean isRecord = true; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/B251A0FE-EFE0-341B-A8B3-E0813CC82856"; + String datasource = "dans"; + String collectionId = "easy"; + readAndIndexTest(isRecord, recordId, datasource, collectionId); + } + private void readAndIndexTest(boolean isRecord, String recordId, String datasource, String collectionId) throws Exception { final ClassPathResource resource = new ClassPathResource("application.properties"); Properties appProps = new Properties();