From 3a16c934c295c79550e2676fde160d31a74ad21d Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Mon, 23 Jan 2023 13:38:23 +0100
Subject: [PATCH] INP sites (RAN): split query for modified and issued dates

---
 .../ordered_sparql_insert_INP_sites.sparql    | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/INP/ordered_sparql_insert_INP_sites.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/INP/ordered_sparql_insert_INP_sites.sparql
index 90faf36..b60e2f2 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/INP/ordered_sparql_insert_INP_sites.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/INP/ordered_sparql_insert_INP_sites.sparql
@@ -19,25 +19,6 @@ INSERT {
         }
 };
 
-PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
-PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::sites> {
-        ?s aocat:was_modified ?issued .
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::sites>
-WHERE {
-    ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-    ?s aocat:was_issued ?issued .
-    MINUS {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-        ?s aocat:was_modified ?modified .
-    }
-};
-
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
@@ -66,7 +47,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::sites> {
         ?s aocat:was_issued ?created_on .
-        ?s aocat:was_modified ?created_on .
     }
 }
 USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::sites>
@@ -79,6 +59,25 @@ WHERE {
     }
 };
 
+PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::sites> {
+        ?s aocat:was_modified ?created_on .
+    }
+}
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::inp::sites>
+WHERE {
+    ?s rdf:type aocat:AO_Individual_Data_Resource .
+    ?s aocat:was_created_on ?created_on .
+    MINUS {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        ?s aocat:was_modified ?issued .
+    }
+};
+
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>