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:
PREFIX rdf:
PREFIX skos:
-INSERT DATA {
+INSERT {
GRAPH {
- aocat:has_type .
+ ?coll aocat:has_type .
rdf:type .
skos:prefLabel "collection"
}
- };
+ }
+WHERE {
+GRAPH {
+ ?coll rdf:type aocat:AO_Collection
+ }
+};
PREFIX aocat:
PREFIX skos:
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:
PREFIX rdfs:
INSERT {
GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
- ?s aocat:has_publisher .
+ ?agent ?p ?o .
+ ?s ?rel ?agent .
}
}
WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_publisher ?x .
- }
+GRAPH {
+ ?coll ?rel ?agent .
+ ?agent ?p ?o .
+ ?agent rdf:type aocat:AO_Agent .
+}
+GRAPH {
+ {?s rdf:type aocat:AO_Collection .}
+ UNION {
+ ?s rdf:type aocat:AO_Individual_Data_Resource .
}
+}
};
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
- ?s aocat:has_creator .
- }
-}
-WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_creator ?x .
- }
- }
-};
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
-
- ?s aocat:has_contributor .
-
- }
-}
-WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_contributor ?x .
- }
- }
-};
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
- ?s aocat:has_responsible .
- }
-}
-WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_responsible ?x .
- }
- }
-};
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
- ?s aocat:has_owner .
-
- }
-}
-WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_owner ?x .
- }
- }
-};
PREFIX aocat:
PREFIX skos:
@@ -165,7 +85,24 @@ INSERT {
}
};
-
+PREFIX aocat:
+PREFIX skos:
+PREFIX rdf:
+PREFIX rdfs:
+INSERT {
+ GRAPH {
+ ?s aocat:has_access_rights ?ar .
+ }
+ }
+ WHERE {
+ GRAPH {
+ ?coll rdf:type .
+ ?coll aocat:has_access_rights ?ar .
+ }
+ GRAPH {
+ {?s rdf:type aocat:AO_Collection} UNION {?s rdf:type aocat:AO_Individual_Data_Resource .}
+ }
+};
PREFIX aocat:
PREFIX skos:
@@ -173,16 +110,18 @@ PREFIX rdf:
PREFIX rdfs:
INSERT {
GRAPH {
- ?s aocat:has_access_rights "Not provided"
+ ?s aocat:has_access_policy ?ar .
+ ?ar ?p ?o.
}
}
WHERE {
- GRAPH {
- ?s rdf:type .
- MINUS{
- ?s rdf:type .
- ?s aocat:has_access_rights ?smt .
- }
+ GRAPH {
+ ?coll rdf:type .
+ ?coll aocat:has_access_policy ?ar .
+ ?ar ?p ?o.
+ }
+ GRAPH {
+ {?s rdf:type aocat:AO_Collection} UNION {?s rdf:type aocat:AO_Individual_Data_Resource .}
}
};
@@ -222,112 +161,6 @@ WHERE {
};
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
- ?s aocat:has_publisher .
- }
-}
-WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_publisher ?x .
- }
- }
-};
-
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
- ?s aocat:has_creator .
- }
-}
-WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_creator ?x .
- }
- }
-};
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
-
- ?s aocat:has_contributor .
-
- }
-}
-WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_contributor ?x .
- }
- }
-};
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
- ?s aocat:has_responsible .
- }
-}
-WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_responsible ?x .
- }
- }
-};
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- rdf:type .
- rdfs:label "THANADOS team" .
- aocat:has_name "THANADOS team"@en .
- ?s aocat:has_owner .
-
- }
-}
-WHERE {
-GRAPH {
- ?s rdf:type .
- MINUS {
- ?s aocat:has_owner ?x .
- }
- }
-};
-
-
PREFIX aocat:
PREFIX rdf:
INSERT {
@@ -350,25 +183,6 @@ USING
-PREFIX rdf:
-INSERT {
- GRAPH {
-
- ?s aocat:has_access_rights "Not provided"
-
- }
- }
- WHERE {
- GRAPH {
- ?s rdf:type .
- MINUS{
- ?s rdf:type .
- ?s aocat:has_access_rights ?x
- }
-
- }
-};
PREFIX skos:
PREFIX aocat:
PREFIX rdf: