From 5f5d290b3c65d98bdf02bed36a7174a160297191 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Thu, 24 Nov 2022 15:53:25 +0100
Subject: [PATCH] enrichment queries for thanados now that we have a
 'supercollection' record

---
 ...ordered_sparql_insert_THANADOS-coll.sparql |  51 +++
 .../ordered_sparql_insert_THANADOS.sparql     | 311 +++++++++++-------
 2 files changed, 247 insertions(+), 115 deletions(-)
 create mode 100644 dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS-coll.sparql

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
new file mode 100644
index 0000000..a263a0c
--- /dev/null
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS-coll.sparql
@@ -0,0 +1,51 @@
+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 {
+    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> .
+          <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"
+        }
+    };
+
+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::coll> {
+          ?s	aocat:was_issued ?c
+        }
+    }
+    WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::coll> {
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?s aocat:was_created_on ?c .
+            MINUS{
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?s	aocat:was_issued ?date .
+            }
+        }
+};
+
+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::coll> {
+          ?s	aocat:was_modified ?c
+        }
+    }
+    WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::coll> {
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?s aocat:was_created_on ?c .
+            MINUS{
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?s	aocat:was_modified ?date .
+            }
+        }
+};
+
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 56d46d8..0d9dd59 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
@@ -1,16 +1,3 @@
-DELETE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        <https://ariadne-infrastructure.eu/aocat/Collection/THANADOS/64905CC0-95E1-3F3B-B797-62FE0C434DF3> ?p ?o .
-        ?s ?x <https://ariadne-infrastructure.eu/aocat/Collection/THANADOS/64905CC0-95E1-3F3B-B797-62FE0C434DF3> .
-    }
-}
-WHERE {
-   GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        <https://ariadne-infrastructure.eu/aocat/Collection/THANADOS/64905CC0-95E1-3F3B-B797-62FE0C434DF3> ?p ?o .
-        ?s ?x <https://ariadne-infrastructure.eu/aocat/Collection/THANADOS/64905CC0-95E1-3F3B-B797-62FE0C434DF3> .
-    }
-};
-
 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#>
@@ -26,7 +13,7 @@ INSERT {
             ?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 .
+                ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> .
             }
         }
 };
@@ -37,33 +24,40 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
       ?s	aocat:has_temporal_coverage ?tcov .
+      ?tcov ?p ?o .
     }
 }
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api>
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::coll>
 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> .
         ?s aocat:is_part_of ?coll .
         ?coll aocat:has_temporal_coverage ?tcov .
+        ?tcov ?p ?o .
         MINUS {
             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
             ?s	aocat:has_temporal_coverage ?tc .
         }
-    }
 };
 
+
 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_title "Title not provided" .
+           <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 aocat:AO_Individual_Data_Resource .
+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 aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_title ?title .
+        ?s	aocat:has_publisher ?x .
         }
     }
 };
@@ -74,20 +68,82 @@ 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> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-          <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS> rdfs:label "THANADOS" .
-          <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS> aocat:has_name "THANADOS" .
-          ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS> .
-          ?s	aocat:has_contributor <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS> .
-          ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS> .
-          ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS> .
-          ?s	aocat:has_publisher <https://ariadne-infrastructure.eu/aocat/Agent/THANADOS> .
+           <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 .
         }
-        }
-    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> {
-            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+           <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/>
@@ -145,124 +201,133 @@ INSERT {
     WHERE {
         GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
-            MINUS {
+        }
+};
+
+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_title "Title not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
             ?s rdf:type aocat:AO_Individual_Data_Resource .
-                ?s	aocat:has_type ?t .
-            }
+            ?s	aocat:has_title ?title .
         }
+    }
 };
 
 
 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_creator ?cr .
-
-        }
-        }
-    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> .
-            ?s aocat:is_part_of ?coll .
-            ?coll	aocat:has_creator ?cr .
-            MINUS{
-                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-                ?s aocat:has_creator ?x
-            }
-
+           <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> {
-
-          ?s	aocat:has_contributor ?cr .
-
-        }
-        }
-    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> .
-            ?s aocat:is_part_of ?coll .
-            ?coll	aocat:has_contributor ?cr .
-            MINUS{
-                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-                ?s aocat:has_contributor ?x
-            }
-
+           <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_responsible ?cr .
-
-        }
-        }
-    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> .
-            ?s aocat:is_part_of ?coll .
-            ?coll	aocat:has_responsible ?cr .
-            MINUS{
-                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-                ?s aocat:has_responsible ?x
-            }
+            ?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> {
-
-          ?s	aocat:has_owner ?cr .
-
-        }
-        }
-    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> .
-            ?s aocat:is_part_of ?coll .
-            ?coll	aocat:has_owner ?cr .
-            MINUS{
-                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-                ?s aocat:has_owner ?x
-            }
-
+           <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> .
 
-          ?s	aocat:has_publisher ?cr .
-
-        }
-        }
-    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> .
-            ?s aocat:is_part_of ?coll .
-            ?coll	aocat:has_publisher ?cr .
-            MINUS{
-                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
-                ?s aocat:has_publisher ?x
-            }
-
+    }
+}
+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 {
@@ -272,8 +337,9 @@ INSERT {
 
         }
         }
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api>
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::coll>
     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> .
             ?s aocat:is_part_of ?coll .
             ?coll	aocat:was_issued ?cr .
@@ -282,7 +348,6 @@ INSERT {
                 ?s aocat:was_issued ?x
             }
 
-        }
 };
 
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
@@ -290,15 +355,13 @@ 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 ?cr .
+          ?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> .
-            ?s aocat:is_part_of ?coll .
-            ?coll	aocat:has_access_rights ?cr .
             MINUS{
                 ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Individual_Data_Resource> .
                 ?s aocat:has_access_rights ?x
@@ -306,6 +369,24 @@ INSERT {
 
         }
 };
+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#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+      ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/THANADOS/NOT_PROVIDED> .
+      <https://ariadne-infrastructure.eu/aocat/Concept/THANADOS/NOT_PROVIDED> skos:prefLabel "Not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_native_subject ?ns .
+        }
+    }
+};
 
 PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>