From 9ce6dbfb3c7e419e9c4f9b2402091c2db87ebede Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Wed, 23 Nov 2022 19:23:22 +0100
Subject: [PATCH] queries for HNM and CARARE

---
 .../ordered_sparql_insert_carare_test.sparql  | 288 ++++++++++++++++++
 ...rdered_sparql_insert_hnm-collection.sparql |  55 ++++
 .../HNM/ordered_sparql_insert_hnm.sparql      | 158 +++++++---
 3 files changed, 453 insertions(+), 48 deletions(-)
 create mode 100644 dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/CARARE/ordered_sparql_insert_carare_test.sparql
 create mode 100644 dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/HNM/ordered_sparql_insert_hnm-collection.sparql

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/CARARE/ordered_sparql_insert_carare_test.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/CARARE/ordered_sparql_insert_carare_test.sparql
new file mode 100644
index 0000000..d7b18bf
--- /dev/null
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/CARARE/ordered_sparql_insert_carare_test.sparql
@@ -0,0 +1,288 @@
+PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+        ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/provided%20record> .
+        <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/provided%20record> skos:prefLabel "provided record" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/provided%20record> .
+        }
+    }
+};
+
+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#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+      ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_owner ?agent .
+        }
+    }
+};
+
+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#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+      ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_responsible ?agent .
+        }
+    }
+};
+
+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#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+      ?s	aocat:has_contributor <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_contributor ?agent .
+        }
+    }
+};
+
+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#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+      ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_creator ?agent .
+        }
+    }
+};
+
+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/>
+
+  INSERT {
+      GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+          ?record aocat:has_publisher ?p .
+          ?p aocat:has_name ?pname .
+      }
+  }
+  USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>
+  USING  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll>
+  WHERE {
+      ?record rdf:type aocat:AO_Individual_Data_Resource .
+      ?record aocat:is_part_of ?coll .
+  	  ?coll aocat:has_publisher ?p .
+  	  ?p aocat:has_name ?pname .
+      MINUS{
+         ?record rdf:type aocat:AO_Individual_Data_Resource .
+         ?record aocat:has_publisher ?pub .
+      }
+  };
+
+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::hnm::hnmad> {
+        ?s aocat:has_native_subject ?ns .
+    }
+}
+USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>
+WHERE {
+ ?s aocat:is_about ?about .
+ ?about aocat:has_type ?ns .
+ ?ns rdf:type aocat:AO_Concept .
+};
+
+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::hnm::hnmad> {
+      ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/HNM/NOT_PROVIDED> .
+      <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> skos:prefLabel "Not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_native_subject ?ns .
+        }
+    }
+};
+
+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/>
+
+  INSERT {
+      GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+          ?record aocat:was_modified ?coll_mod .
+      }
+  }
+  USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>
+  USING  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll>
+  WHERE {
+      ?record rdf:type aocat:AO_Individual_Data_Resource .
+      ?record aocat:is_part_of ?coll .
+  	?coll aocat:was_modified ?coll_mod .
+      MINUS{
+         ?record rdf:type aocat:AO_Individual_Data_Resource .
+         ?record aocat:was_modified ?modified .
+      }
+  };
+
+
+
+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/>
+
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>{
+        ?record aocat:was_issued ?coll_iss .
+    }
+}
+  USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>
+  USING  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll>
+WHERE {
+    ?record rdf:type aocat:AO_Individual_Data_Resource .
+    ?record aocat:is_part_of ?coll .
+	?coll aocat:was_issued ?coll_iss .
+    MINUS{
+       ?record rdf:type aocat:AO_Individual_Data_Resource .
+       ?record aocat:was_issued ?issued .
+    }
+};
+
+PREFIX dcterms: <http://purl.org/dc/terms/>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::hnm::periodo> {
+            ?periodO ?pred ?o .
+            ?o ?pred2 ?o2 .
+            ?o2 ?pred3 ?o3 .
+        }
+    }
+    WHERE {
+        GRAPH <https://ariadne-infrastructure.eu/ariadne/periodo> {
+            ?periodO dcterms:spatial <http://www.wikidata.org/entity/Q28> .
+            ?periodO ?pred ?o .
+            optional {
+                ?o ?pred2 ?o2 .
+                optional {
+                    ?o2 ?pred3 ?o3 .
+                }
+            }
+        }
+    };
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX time: <http://www.w3.org/2006/time#>
+ PREFIX dcterms: <http://purl.org/dc/terms/>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::hnm::periodoplus> {
+         ?temporal aocat:has_period ?periodO .
+         ?temporal aocat:from ?temporalFrom .
+         ?temporal aocat:until ?temporalUntil .
+     }
+ }
+ WHERE {
+ 	GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+       ?temporal aocat:has_native_period ?native_period .
+        ?native_period skos:prefLabel ?native_label .
+        optional {
+            GRAPH <https://ariadne-infrastructure.eu/ariadneplus::hnm::periodo> {
+                ?periodO skos:altLabel ?native_label .
+                ?periodO time:intervalStartedBy / time:hasDateTimeDescription / time:year ?temporalFrom .
+                ?periodO time:intervalFinishedBy / time:hasDateTimeDescription / time:year ?temporalUntil .
+            }
+       }
+   }
+ };
+
+ PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::hnm::aatplus> {
+         ?record aocat:has_derived_subject ?aat .
+     }
+ }
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::aat>
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>
+ WHERE {
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?aat_subject skos:closeMatch ?aat	.
+             bind (IRI(concat( "https://ariadne-infrastructure.eu/aocat/Concept/HNM/", ucase(strafter(str(?native_subject),"HNM/")))) as ?uppercase_native_subject)
+             filter(?uppercase_native_subject=?aat_subject)
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?aat_subject skos:exactMatch ?aat	.
+             bind (IRI(concat( "https://ariadne-infrastructure.eu/aocat/Concept/HNM/", ucase(strafter(str(?native_subject),"HNM/")))) as ?uppercase_native_subject)
+             filter(?uppercase_native_subject=?aat_subject)
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?aat_subject skos:broadMatch ?aat	.
+             bind (IRI(concat( "https://ariadne-infrastructure.eu/aocat/Concept/HNM/", ucase(strafter(str(?native_subject),"HNM/")))) as ?uppercase_native_subject)
+             filter(?uppercase_native_subject=?aat_subject)
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?aat_subject skos:narrowMatch ?aat	.
+             bind (IRI(concat( "https://ariadne-infrastructure.eu/aocat/Concept/HNM/", ucase(strafter(str(?native_subject),"HNM/")))) as ?uppercase_native_subject)
+             filter(?uppercase_native_subject=?aat_subject)
+         }
+ };
\ No newline at end of file
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/HNM/ordered_sparql_insert_hnm-collection.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/HNM/ordered_sparql_insert_hnm-collection.sparql
new file mode 100644
index 0000000..b863dd6
--- /dev/null
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/HNM/ordered_sparql_insert_hnm-collection.sparql
@@ -0,0 +1,55 @@
+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#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll> {
+          ?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::hnm::coll> {
+            ?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 rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll> {
+          ?s	aocat:was_modified ?created
+        }
+    }
+    WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll> {
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?s aocat:was_created_on ?created
+            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#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll> {
+          ?s	aocat:was_issued ?created
+        }
+    }
+    WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll> {
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?s aocat:was_created_on ?created
+            MINUS {
+                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+                ?s	aocat:was_issued ?modified
+            }
+        }
+};
\ No newline at end of file
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/HNM/ordered_sparql_insert_hnm.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/HNM/ordered_sparql_insert_hnm.sparql
index ecf7496..d7b18bf 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/HNM/ordered_sparql_insert_hnm.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/HNM/ordered_sparql_insert_hnm.sparql
@@ -1,45 +1,21 @@
 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#>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
-      ?s	aocat:has_temporal_coverage <https://ariadne-infrastructure.eu/aocat/Time-Span/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Time-Span/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Temporal_Region> .
-      <https://ariadne-infrastructure.eu/aocat/Time-Span/NOTPROVIDED> rdfs:label "Not provided" .
-
+        ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/provided%20record> .
+        <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/provided%20record> skos:prefLabel "provided record" .
     }
 }
 WHERE {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
         MINUS {
-            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-            ?s	aocat:has_temporal_coverage ?tc .
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/provided%20record> .
         }
     }
 };
 
-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::hnm::hnmad> {
-          ?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 "Dataset Collection"
-        }
-    }
-    WHERE {
-        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
-            ?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 rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
@@ -53,9 +29,9 @@ INSERT {
 }
 WHERE {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
         MINUS {
-            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
             ?s	aocat:has_owner ?agent .
         }
     }
@@ -74,9 +50,9 @@ INSERT {
 }
 WHERE {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
         MINUS {
-            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
             ?s	aocat:has_responsible ?agent .
         }
     }
@@ -95,9 +71,9 @@ INSERT {
 }
 WHERE {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
         MINUS {
-            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
             ?s	aocat:has_contributor ?agent .
         }
     }
@@ -108,22 +84,45 @@ 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::hnm::hnmad> {
-          ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
-          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
-          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+      ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_creator ?agent .
         }
     }
-    WHERE {
-        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
-            ?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_creator ?agent .
-            }
-        }
 };
 
+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/>
+
+  INSERT {
+      GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+          ?record aocat:has_publisher ?p .
+          ?p aocat:has_name ?pname .
+      }
+  }
+  USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>
+  USING  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll>
+  WHERE {
+      ?record rdf:type aocat:AO_Individual_Data_Resource .
+      ?record aocat:is_part_of ?coll .
+  	  ?coll aocat:has_publisher ?p .
+  	  ?p aocat:has_name ?pname .
+      MINUS{
+         ?record rdf:type aocat:AO_Individual_Data_Resource .
+         ?record aocat:has_publisher ?pub .
+      }
+  };
+
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 
@@ -139,6 +138,69 @@ WHERE {
  ?ns rdf:type aocat:AO_Concept .
 };
 
+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::hnm::hnmad> {
+      ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/HNM/NOT_PROVIDED> .
+      <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> skos:prefLabel "Not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_native_subject ?ns .
+        }
+    }
+};
+
+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/>
+
+  INSERT {
+      GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad> {
+          ?record aocat:was_modified ?coll_mod .
+      }
+  }
+  USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>
+  USING  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll>
+  WHERE {
+      ?record rdf:type aocat:AO_Individual_Data_Resource .
+      ?record aocat:is_part_of ?coll .
+  	?coll aocat:was_modified ?coll_mod .
+      MINUS{
+         ?record rdf:type aocat:AO_Individual_Data_Resource .
+         ?record aocat:was_modified ?modified .
+      }
+  };
+
+
+
+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/>
+
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>{
+        ?record aocat:was_issued ?coll_iss .
+    }
+}
+  USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::hnmad>
+  USING  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::hnm::coll>
+WHERE {
+    ?record rdf:type aocat:AO_Individual_Data_Resource .
+    ?record aocat:is_part_of ?coll .
+	?coll aocat:was_issued ?coll_iss .
+    MINUS{
+       ?record rdf:type aocat:AO_Individual_Data_Resource .
+       ?record aocat:was_issued ?issued .
+    }
+};
+
 PREFIX dcterms: <http://purl.org/dc/terms/>
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::hnm::periodo> {