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 c72687b..62f389f 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 @@ -26,6 +26,21 @@ WHERE { ?record aocat:is_about ?event . }; +PREFIX aocat: +PREFIX rdf: +INSERT { + GRAPH { + ?record aocat:has_temporal_coverage ?temporal_k . + } +} +USING +WHERE { + ?record_k aocat:happens_at ?temporal_k . + ?record_k aocat:occurs_in ?region. + ?region aocat:is_space_region_of ?site . + ?record aocat:is_about ?site . +}; + PREFIX aocat: PREFIX rdf: PREFIX crm: @@ -70,6 +85,21 @@ WHERE { ?record aocat:is_about ?event . }; +PREFIX aocat: +PREFIX rdf: +INSERT { + GRAPH { + ?record aocat:has_spatial_coverage ?spatial . + } +} +USING +WHERE { + ?region aocat:is_subject_of ?spatial_ref . + ?spatial_ref aocat:has_spatial_coverage ?spatial . + ?region aocat:is_space_region_of ?site . + ?record aocat:is_about ?site . +}; + PREFIX aocat: PREFIX skos: PREFIX rdf: @@ -474,6 +504,23 @@ WHERE { ?record aocat:is_about ?site . }; +PREFIX aocat: +PREFIX rdf: +INSERT { + GRAPH { + ?record aocat:has_native_subject ?ns . + } +} +USING +WHERE { + ?record_k aocat:occured_in_the_presence_of ?activityArea . + ?activityArea aocat:has_type ?ns . + ?ns rdf:type aocat:AO_Concept . + ?record_k aocat:occurs_in ?region. + ?region aocat:is_space_region_of ?site . + ?record aocat:is_about ?site . +}; + PREFIX aocat: PREFIX rdf: PREFIX crm: 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 76597a8..b4b09b7 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 @@ -42,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 +51,15 @@ public class GraphDbReaderAndESIndexTest { readAndIndexTest(isRecord, recordId, datasource, collectionId); } + @Test + public void uploadAMCRSiteTest() throws Exception { + boolean isRecord = true; + String recordId = "https://ariadne-infrastructure.eu/aocat/Resource/AMCR/3C7EC936-A7CA-3720-B3DC-413A25754FD4"; + String datasource = "amcr"; + String collectionId = "oai"; + readAndIndexTest(isRecord, recordId, datasource, collectionId); + } + @Test @Ignore public void uploadADSRecordTest() throws Exception {