diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1.sparql
deleted file mode 100644
index edcfcdf..0000000
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1.sparql
+++ /dev/null
@@ -1,238 +0,0 @@
-PREFIX aocat:
-PREFIX skos:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- ?collection aocat:has_ARIADNE_subject ?archeologicalResourceType .
- ?archeologicalResourceType skos:prefLabel ?archeologicalResourceTypeName .
- ?archeologicalResourceType rdfs:label ?archeologicalResourceTypeName .
- }
-}
-WHERE {
- ?collection rdf:type .
- ?collection aocat:has_ARIADNE_subject ?archeologicalResourceType .
- ?archeologicalResourceType skos:prefLabel ?archeologicalResourceTypeName .
- ?collection aocat:has_original_id "1000001" .
-};
-
-PREFIX aocat:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- ?s aocat:has_temporal_coverage .
- rdf:type .
- rdfs:label "Not provided" .
-
- }
-}
-WHERE {
- GRAPH {
- ?s rdf:type .
- MINUS {
- ?s rdf:type .
- ?s aocat:has_temporal_coverage ?tc .
- }
- }
-};
-
-PREFIX aocat:
-PREFIX rdf:
-PREFIX rdfs:
-INSERT {
- GRAPH {
- ?s aocat:has_temporal_coverage .
- rdf:type .
- rdfs:label "Not provided" .
-
- }
-}
-WHERE {
- GRAPH {
- ?s rdf:type .
- MINUS {
- ?s rdf:type .
- ?s aocat:has_temporal_coverage ?tc .
- }
- }
-};
-
-PREFIX aocat:
-PREFIX skos:
-PREFIX ariadneplus:
-
-INSERT {
- GRAPH {
- ?record aocat:was_issued ?issued .
- ?record aocat:was_modified ?modified .
- ?record aocat:has_contributor ?contributor .
- ?record aocat:has_responsible ?legalResponsible .
- ?record aocat:has_owner ?owner .
- ?record aocat:has_publisher ?publisher .
- ?record aocat:has_access_rights ?accessRights .
- ?record aocat:has_ARIADNE_subject ?archeologicalResourceType .
- }
-}
-USING
-WHERE {
- ?record aocat:is_part_of ?collection .
- ?collection aocat:was_issued ?issued .
- ?collection aocat:was_modified ?modified .
- ?collection aocat:has_contributor ?contributor .
- ?collection aocat:has_responsible ?legalResponsible .
- ?collection aocat:has_owner ?owner .
- ?collection aocat:has_publisher ?publisher .
- ?collection aocat:has_access_rights ?accessRights .
- ?collection aocat:has_ARIADNE_subject ?archeologicalResourceType .
-};
-
-PREFIX aocat:
-PREFIX rdf:
-
-INSERT {
- GRAPH {
- ?s aocat:has_native_subject ?ns .
- }
-}
-USING
-WHERE {
- ?s aocat:is_about ?about .
- ?about aocat:has_type ?ns .
- ?ns rdf:type aocat:AO_Concept .
-};
-
-PREFIX aocat:
-PREFIX rdf:
-PREFIX skos:
-
-INSERT {
- GRAPH {
- ?s aocat:has_native_subject .
- skos:prefLabel "Not provided" .
- }
-}
-WHERE {
- GRAPH {
- ?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:
-PREFIX rdf:
-
-INSERT {
- GRAPH {
- ?s aocat:has_temporal_coverage ?t .
- }
-}
-USING
-WHERE {
- ?s aocat:is_about ?about .
- ?about aocat:has_time_interval ?t .
- ?t rdf:type aocat:AO_Temporal_Region .
-};
-
-PREFIX aocat:
-PREFIX skos:
-
-INSERT {
- GRAPH {
- ?record aocat:has_derived_subject ?aat .
- }
-}
-USING
-USING
-WHERE {
- {
- ?record aocat:has_native_subject ?native_subject .
- ?native_subject skos:exactMatch ?aat .
- }
- union
- {
- ?record aocat:has_native_subject ?native_subject .
- ?native_subject skos:broadMatch ?aat .
- }
- union
- {
- ?record aocat:has_native_subject ?native_subject .
- ?native_subject skos:closeMatch ?aat .
- }
- union
- {
- ?record aocat:has_native_subject ?native_subject .
- ?native_subject skos:narrowMatch ?aat .
- }
-};
-
- PREFIX skos:
- PREFIX aocat:
- PREFIX time:
- INSERT {
- GRAPH {
- ?temporal aocat:has_period ?periodO .
- ?temporal aocat:from ?temporalFrom .
- ?temporal aocat:until ?temporalUntil .
- }
- }
- WHERE {
- GRAPH {
- ?temporal aocat:has_native_period ?native_period .
- ?native_period skos:prefLabel ?native_label .
- GRAPH {
- ?periodO skos:altLabel ?lowercase_native_label .
- ?periodO skos:inScheme .
- ?periodO time:intervalStartedBy ?intervalStartedBy .
- ?intervalStartedBy skos:prefLabel ?temporalFrom .
- ?periodO time:intervalFinishedBy ?intervalFinishedBy .
- ?intervalFinishedBy skos:prefLabel ?temporalUntil .
- BIND(ucase(?lowercase_native_label) as ?native_label)
- }
- }
- };
-
- PREFIX aocat:
- PREFIX rdf:
- PREFIX rdfs:
- INSERT {
- GRAPH {
- ?c aocat:has_name ?l .
- }
- }
- WHERE {
- GRAPH {
- ?s rdf:type aocat:AO_Individual_Data_Resource .
- ?s aocat:has_owner ?c .
- ?c rdfs:label ?l .
- MINUS {
- ?s rdf:type aocat:AO_Individual_Data_Resource .
- ?s aocat:has_owner ?c .
- ?c aocat:has_name ?n .
- }
- }
- };
-
- PREFIX aocat:
- PREFIX rdf:
- PREFIX rdfs:
- INSERT {
- GRAPH {
- ?c aocat:has_name ?l .
- }
- }
- WHERE {
- GRAPH {
- ?s rdf:type aocat:AO_Individual_Data_Resource .
- ?s aocat:has_publisher ?c .
- ?c rdfs:label ?l .
- MINUS {
- ?s rdf:type aocat:AO_Individual_Data_Resource .
- ?s aocat:has_publisher ?c .
- ?c aocat:has_name ?n .
- }
- }
- };
\ No newline at end of file
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ASU/ordered_sparql_insert_tdar.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ASU/ordered_sparql_insert_tdar.sparql
index a028176..568700b 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ASU/ordered_sparql_insert_tdar.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ASU/ordered_sparql_insert_tdar.sparql
@@ -205,4 +205,29 @@ WHERE {
?spatialRegion aocat:has_place_name ?placeName .
}
}
-};
\ No newline at end of file
+};
+
+PREFIX skos:
+ PREFIX aocat:
+ PREFIX time:
+ PREFIX dcterms:
+ INSERT {
+ GRAPH {
+ ?temporal aocat:has_period ?periodO .
+ ?temporal aocat:from ?temporalFrom .
+ ?temporal aocat:until ?temporalUntil .
+ }
+ }
+ WHERE {
+ GRAPH {
+ ?temporal aocat:has_native_period ?native_period .
+ ?native_period skos:prefLabel ?native_label .
+ optional {
+ GRAPH {
+ ?periodO skos:altLabel ?native_label .
+ ?periodO time:intervalStartedBy / time:hasDateTimeDescription / time:year ?temporalFrom .
+ ?periodO time:intervalFinishedBy / time:hasDateTimeDescription / time:year ?temporalUntil .
+ }
+ }
+ }
+ };
\ No newline at end of file