diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_archives.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_archives.sparql index f7ed24e..7d55242 100644 --- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_archives.sparql +++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_archives.sparql @@ -302,23 +302,27 @@ PREFIX skos: USING WHERE { { - ?record aocat:has_native_subject ?native_subject . - ?native_subject skos:exactMatch ?aat . + ?record aocat:has_native_subject ?native_subject . + ?aat_subject owl:sameAs ?native_subject . + ?aat_subject skos:exactMatch ?aat . } union { - ?record aocat:has_native_subject ?native_subject . - ?native_subject skos:broadMatch ?aat . + ?record aocat:has_native_subject ?native_subject . + ?aat_subject owl:sameAs ?native_subject . + ?aat_subject skos:broadMatch ?aat . } union { - ?record aocat:has_native_subject ?native_subject . - ?native_subject skos:closeMatch ?aat . + ?record aocat:has_native_subject ?native_subject . + ?aat_subject owl:sameAs ?native_subject . + ?aat_subject skos:closeMatch ?aat . } union { - ?record aocat:has_native_subject ?native_subject . - ?native_subject skos:narrowMatch ?aat . + ?record aocat:has_native_subject ?native_subject . + ?aat_subject owl:sameAs ?native_subject . + ?aat_subject skos:narrowMatch ?aat . } }; 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 addad89..e40740c 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 @@ -32,6 +32,7 @@ public class GraphDbReaderAndESIndexTest { private RunSPARQLQueryService runSPQRLQuery; @Test + @Ignore public void uploadAMCRFieldworkTest() throws Exception { boolean isRecord = true; String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AMCR/E61E0F4E-268F-39E4-8EDB-A431AFC505AA"; @@ -41,6 +42,7 @@ public class GraphDbReaderAndESIndexTest { } @Test + @Ignore public void uploadAMCRDocumentTest() throws Exception { boolean isRecord = true; String recordId = "https://ariadne-infrastructure.eu/aocat/Collection/AMCR/FC59581D-DC3A-31DA-922A-98DE764F3D76"; @@ -50,6 +52,7 @@ public class GraphDbReaderAndESIndexTest { } @Test + @Ignore public void uploadAMCRSiteTest() throws Exception { boolean isRecord = true; String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AMCR/3C7EC936-A7CA-3720-B3DC-413A25754FD4"; @@ -59,6 +62,7 @@ public class GraphDbReaderAndESIndexTest { } @Test + @Ignore public void uploadADSRecordTest() throws Exception { boolean isRecord = true; String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/34E3811A-0BAD-3832-B3A0-3139E8A0285C"; @@ -68,6 +72,7 @@ public class GraphDbReaderAndESIndexTest { } @Test + @Ignore public void uploadADSRecordWithNativeFromUntilTest() throws Exception { boolean isRecord = true; String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/3C3C7A86-FF09-3431-95B1-B9A4AA8293AF"; @@ -87,6 +92,7 @@ public class GraphDbReaderAndESIndexTest { } @Test + @Ignore public void uploadZbivaRecordSpatialTest() throws Exception { boolean isRecord = true; String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/ZRC-SAZU-Zbiva/B34517C6-8D94-3A02-B461-08522F958479"; @@ -96,6 +102,7 @@ public class GraphDbReaderAndESIndexTest { } @Test + @Ignore public void uploadHNMCollectionSpatialTest() throws Exception { boolean isRecord = false; String recordId = "https://ariadne-infrastructure.eu/aocat/Collection/HNM/5A7A4257-EE73-31F9-9F74-BADB371555F5"; @@ -105,6 +112,7 @@ public class GraphDbReaderAndESIndexTest { } @Test + @Ignore public void uploadHNMCollectionTemporalTest() throws Exception { boolean isRecord = false; String recordId = "https://ariadne-infrastructure.eu/aocat/Collection/HNM/0F1AF07E-CE63-342C-8E95-11FF1C024BD5"; @@ -114,6 +122,16 @@ public class GraphDbReaderAndESIndexTest { } @Test + public void uploadADSArchivesBoundingBoxTest() throws Exception { + boolean isRecord = true; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/90D1C95D-E249-3E74-92D9-B58FDF690CC7"; + String datasource = "ads"; + String collectionId = "archives"; + readAndIndexTest(isRecord, recordId, datasource, collectionId); + } + + @Test + @Ignore public void uploadDansNoSpatialTest() throws Exception { boolean isRecord = true; String recordId = "https://ariadne-portal-staging.d4science.org/resource/F100A0AD-6A7F-3976-B77F-FFAB4F5B55DD";