From f86160c17c59235f41b185598c59b189491488d2 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Wed, 14 Dec 2022 18:48:30 +0100
Subject: [PATCH] updated enrichment queries for THANADOS

---
 ...ordered_sparql_insert_THANADOS-coll.sparql |  11 +-
 .../ordered_sparql_insert_THANADOS.sparql     | 264 +++---------------
 2 files changed, 47 insertions(+), 228 deletions(-)

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS-coll.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS-coll.sparql
index a263a0c..6846a9b 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS-coll.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS-coll.sparql
@@ -1,13 +1,18 @@
 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 DATA {
+INSERT  {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::coll> {
-          <https://ariadne-infrastructure.eu/aocat/Collection/THANADOS/64905CC0-95E1-3F3B-B797-62FE0C434DF3>	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> .
+          ?coll	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::thanados::coll> {
+    ?coll rdf:type aocat:AO_Collection
+    }
+};
 
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS.sparql
index 0d9dd59..c4d6f6f 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS.sparql
@@ -47,104 +47,24 @@ 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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-            ?s	aocat:has_publisher <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
+           ?agent ?p ?o .
+           ?s ?rel ?agent .
     }
 }
 WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-        MINUS {
-        ?s	aocat:has_publisher ?x .
-        }
+GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::coll> {
+    ?coll ?rel ?agent .
+    ?agent ?p ?o .
+    ?agent rdf:type aocat:AO_Agent .
+}
+GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api>{
+    {?s rdf:type aocat:AO_Collection .}
+    UNION {
+    ?s rdf:type aocat:AO_Individual_Data_Resource .
     }
+}
 };
 
-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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-            ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
-    }
-}
-WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-        MINUS {
-        ?s	aocat:has_creator ?x .
-        }
-    }
-};
-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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-
-            ?s	aocat:has_contributor <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
-
-    }
-}
-WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-        MINUS {
-        ?s	aocat:has_contributor ?x .
-        }
-    }
-};
-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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-         ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
-    }
-}
-WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-        MINUS {
-        ?s	aocat:has_responsible ?x .
-        }
-    }
-};
-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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-            ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
-
-    }
-}
-WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-        MINUS {
-        ?s	aocat:has_owner ?x .
-        }
-    }
-};
 
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
@@ -165,7 +85,24 @@ 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::thanados::api> {
+          ?s	aocat:has_access_rights ?ar .
+        }
+    }
+    WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::coll> {
+            ?coll rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?coll aocat:has_access_rights ?ar .
+        }
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+        {?s rdf:type aocat:AO_Collection} UNION {?s rdf:type aocat:AO_Individual_Data_Resource .}
+        }
+};
 
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
@@ -173,16 +110,18 @@ 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::thanados::api> {
-          ?s	aocat:has_access_rights "Not provided"
+          ?s aocat:has_access_policy ?ar .
+          ?ar ?p ?o.
         }
     }
     WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-            ?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_access_rights ?smt .
-            }
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::coll> {
+            ?coll rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?coll aocat:has_access_policy ?ar .
+            ?ar ?p ?o.
+        }
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+        {?s rdf:type aocat:AO_Collection} UNION {?s rdf:type aocat:AO_Individual_Data_Resource .}
         }
 };
 
@@ -222,112 +161,6 @@ 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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-            ?s	aocat:has_publisher <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
-    }
-}
-WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-        MINUS {
-        ?s	aocat:has_publisher ?x .
-        }
-    }
-};
-
-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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-            ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
-    }
-}
-WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-        MINUS {
-        ?s	aocat:has_creator ?x .
-        }
-    }
-};
-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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-
-            ?s	aocat:has_contributor <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
-
-    }
-}
-WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-        MINUS {
-        ?s	aocat:has_contributor ?x .
-        }
-    }
-};
-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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-         ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
-    }
-}
-WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-        MINUS {
-        ?s	aocat:has_responsible ?x .
-        }
-    }
-};
-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::thanados::api> {
-           <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> rdfs:label "THANADOS team" .
-            <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> aocat:has_name "THANADOS team"@en .
-            ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS%20team> .
-
-    }
-}
-WHERE {
-GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-        MINUS {
-        ?s	aocat:has_owner ?x .
-        }
-    }
-};
-
-
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 INSERT {
@@ -350,25 +183,6 @@ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::c
 
 };
 
-PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-
-          ?s	aocat:has_access_rights "Not provided"
-
-        }
-        }
-    WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-            MINUS{
-                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-                ?s aocat:has_access_rights ?x
-            }
-
-        }
-};
 PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>