From d77a1d86a42243e31e6545e8c0e19be51bc6f339 Mon Sep 17 00:00:00 2001
From: Enrico Ottonello <enrico.ottonello@isti.cnr.it>
Date: Fri, 12 Mar 2021 12:38:44 +0100
Subject: [PATCH] enrichment for collectionInfo must be executed before records
 enrichment

---
 .../ADS/ordered_sparql_insert_archives.sparql | 40 -------------------
 ...parql_insert_archivesCollectionInfo.sparql | 39 ++++++++++++++++++
 2 files changed, 39 insertions(+), 40 deletions(-)
 create mode 100644 dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_archivesCollectionInfo.sparql

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 7d55242..7ccc5f5 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
@@ -1,43 +1,3 @@
-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::ads::archivesCollInfo> {
-        ?s aocat:was_issued ?created_on .
-        ?s aocat:was_modified ?created_on .
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::archivesCollInfo>
-WHERE {
-    ?s rdf:type aocat:AO_Collection .
-    ?s aocat:was_created_on ?created_on .
-    MINUS {
-        ?s rdf:type aocat:AO_Collection .
-        ?s aocat:was_issued ?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 skos: <http://www.w3.org/2004/02/skos/core#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::archivesCollInfo> {
-          ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> .
-          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Concept> .
-          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> skos:prefLabel "collection"
-        }
-    }
-    WHERE {
-        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::archivesCollInfo> {
-            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-            MINUS {
-                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-                ?s	aocat:has_type ?t .
-            }
-        }
-};
-
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_archivesCollectionInfo.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_archivesCollectionInfo.sparql
new file mode 100644
index 0000000..cacfa23
--- /dev/null
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_archivesCollectionInfo.sparql
@@ -0,0 +1,39 @@
+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::ads::archivesCollInfo> {
+        ?s aocat:was_issued ?created_on .
+        ?s aocat:was_modified ?created_on .
+    }
+}
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::archivesCollInfo>
+WHERE {
+    ?s rdf:type aocat:AO_Collection .
+    ?s aocat:was_created_on ?created_on .
+    MINUS {
+        ?s rdf:type aocat:AO_Collection .
+        ?s aocat:was_issued ?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 skos: <http://www.w3.org/2004/02/skos/core#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::archivesCollInfo> {
+          ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> .
+          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Concept> .
+          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> skos:prefLabel "collection"
+        }
+    }
+    WHERE {
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::archivesCollInfo> {
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            MINUS {
+                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+                ?s	aocat:has_type ?t .
+            }
+        }
+};
\ No newline at end of file