From ca42e0d01e0bfeb9257b9b2e3019f393a6ad0d92 Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Fri, 7 Aug 2020 17:45:45 +0200
Subject: [PATCH] fixed SPARQL INSERT for PeriodO enrichment

---
 ..._insert_periodo_enrichment_template.sparql | 51 ++++++++++---------
 .../ADS/ordered_sparql_insert_1957.sparql     | 31 ++++++-----
 .../ADS/ordered_sparql_insert_270.sparql      | 34 ++++++++-----
 .../ADS/ordered_sparql_insert_273.sparql      | 31 ++++++-----
 .../ADS/ordered_sparql_insert_836.sparql      | 34 ++++++++-----
 5 files changed, 102 insertions(+), 79 deletions(-)

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/05_insert_periodo_enrichment_template.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/05_insert_periodo_enrichment_template.sparql
index 42b9d9e..ba72424 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/05_insert_periodo_enrichment_template.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/05_insert_periodo_enrichment_template.sparql
@@ -1,26 +1,27 @@
-PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
-PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
-PREFIX time: <http://www.w3.org/2006/time#>
-PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
 #PERIODO ENRICHMENT
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::<PROVIDER>::periodoplus> {
-        ?temporal aocat:has_period ?periodO .
-        ?temporal aocat:from ?temporalFrom .
-        ?temporal aocat:until ?temporalUntil .
-    }
-}
-WHERE {
-	?temporal aocat:has_native_period ?native_period .
-    ?native_period skos:prefLabel ?native_label .
-    optional {
-        ?periodO skos:altLabel ?native_label .
-        ?periodO skos:inScheme	<SCHEME_PROVIDER> .
-        ?periodO time:intervalStartedBy ?intervalStartedBy .
-        ?intervalStartedBy skos:prefLabel ?temporalFrom .
-        ?periodO time:intervalFinishedBy ?intervalFinishedBy .
-        ?intervalFinishedBy skos:prefLabel ?temporalUntil .
-    }
-};
\ No newline at end of file
+ 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#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::<provider>::periodoplus> {
+         ?temporal aocat:has_period ?periodO .
+         ?temporal aocat:from ?temporalFrom .
+         ?temporal aocat:until ?temporalUntil .
+     }
+ }
+ WHERE {
+ 	GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::<provider>::<coll>> {
+       ?temporal aocat:has_native_period ?native_period .
+        ?native_period skos:prefLabel ?native_label .
+        optional {
+            GRAPH <https://ariadne-infrastructure.eu/ariadneplus::<provider>::periodo> {
+                ?periodO skos:altLabel ?native_label .
+                ?periodO skos:inScheme	<PROVIDER_PERIODO_SCHEME_URL> .
+                ?periodO time:intervalStartedBy ?intervalStartedBy .
+                ?intervalStartedBy skos:prefLabel ?temporalFrom .
+                ?periodO time:intervalFinishedBy ?intervalFinishedBy .
+                ?intervalFinishedBy skos:prefLabel ?temporalUntil .
+            }
+       }
+   }
+ };
\ No newline at end of file
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1957.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1957.sparql
index f1e746c..5b2e1ca 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1957.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1957.sparql
@@ -163,7 +163,7 @@ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
  PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
  INSERT {
-     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::aatplus> {
          ?record aocat:has_derived_subject ?aat .
      }
  }
@@ -194,22 +194,27 @@ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  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#> 
- INSERT {
-     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
+ PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
+INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::periodoplus> {
          ?temporal aocat:has_period ?periodO .
          ?temporal aocat:from ?temporalFrom .
          ?temporal aocat:until ?temporalUntil .
      }
  }
  WHERE {
- 	?temporal aocat:has_native_period ?native_period .
-     ?native_period skos:prefLabel ?native_label .
-     optional {
-         ?periodO skos:altLabel ?native_label .
-         ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
-         ?periodO time:intervalStartedBy ?intervalStartedBy .
-         ?intervalStartedBy skos:prefLabel ?temporalFrom .
-         ?periodO time:intervalFinishedBy ?intervalFinishedBy .
-         ?intervalFinishedBy skos:prefLabel ?temporalUntil .
-     }
+ 	GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+       ?temporal aocat:has_native_period ?native_period .
+        ?native_period skos:prefLabel ?native_label .
+        optional {
+            GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::periodo> {
+                ?periodO skos:altLabel ?native_label .
+                ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
+                ?periodO time:intervalStartedBy ?intervalStartedBy .
+                ?intervalStartedBy skos:prefLabel ?temporalFrom .
+                ?periodO time:intervalFinishedBy ?intervalFinishedBy .
+                ?intervalFinishedBy skos:prefLabel ?temporalUntil .
+            }
+       }
+   }
  };
\ No newline at end of file
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_270.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_270.sparql
index ead5e5c..d0057a7 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_270.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_270.sparql
@@ -163,7 +163,7 @@ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
  PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
  INSERT {
-     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::aatplus> {
          ?record aocat:has_derived_subject ?aat .
      }
  }
@@ -194,22 +194,28 @@ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  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#> 
- INSERT {
-     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
+ PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
+INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::periodoplus> {
          ?temporal aocat:has_period ?periodO .
          ?temporal aocat:from ?temporalFrom .
          ?temporal aocat:until ?temporalUntil .
      }
  }
  WHERE {
- 	?temporal aocat:has_native_period ?native_period .
-     ?native_period skos:prefLabel ?native_label .
-     optional {
-         ?periodO skos:altLabel ?native_label .
-         ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
-         ?periodO time:intervalStartedBy ?intervalStartedBy .
-         ?intervalStartedBy skos:prefLabel ?temporalFrom .
-         ?periodO time:intervalFinishedBy ?intervalFinishedBy .
-         ?intervalFinishedBy skos:prefLabel ?temporalUntil .
-     }
- };
\ No newline at end of file
+ 	GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+       ?temporal aocat:has_native_period ?native_period .
+        ?native_period skos:prefLabel ?native_label .
+        optional {
+            GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::periodo> {
+                ?periodO skos:altLabel ?native_label .
+                ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
+                ?periodO time:intervalStartedBy ?intervalStartedBy .
+                ?intervalStartedBy skos:prefLabel ?temporalFrom .
+                ?periodO time:intervalFinishedBy ?intervalFinishedBy .
+                ?intervalFinishedBy skos:prefLabel ?temporalUntil .
+            }
+       }
+   }
+ };
+
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_273.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_273.sparql
index eca2a4c..d50e343 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_273.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_273.sparql
@@ -163,7 +163,7 @@ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
  PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
  INSERT {
-     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::aatplus> {
          ?record aocat:has_derived_subject ?aat .
      }
  }
@@ -194,22 +194,27 @@ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  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#> 
- INSERT {
-     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
+ PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
+INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::periodoplus> {
          ?temporal aocat:has_period ?periodO .
          ?temporal aocat:from ?temporalFrom .
          ?temporal aocat:until ?temporalUntil .
      }
  }
  WHERE {
- 	?temporal aocat:has_native_period ?native_period .
-     ?native_period skos:prefLabel ?native_label .
-     optional {
-         ?periodO skos:altLabel ?native_label .
-         ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
-         ?periodO time:intervalStartedBy ?intervalStartedBy .
-         ?intervalStartedBy skos:prefLabel ?temporalFrom .
-         ?periodO time:intervalFinishedBy ?intervalFinishedBy .
-         ?intervalFinishedBy skos:prefLabel ?temporalUntil .
-     }
+ 	GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+       ?temporal aocat:has_native_period ?native_period .
+        ?native_period skos:prefLabel ?native_label .
+        optional {
+            GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::periodo> {
+                ?periodO skos:altLabel ?native_label .
+                ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
+                ?periodO time:intervalStartedBy ?intervalStartedBy .
+                ?intervalStartedBy skos:prefLabel ?temporalFrom .
+                ?periodO time:intervalFinishedBy ?intervalFinishedBy .
+                ?intervalFinishedBy skos:prefLabel ?temporalUntil .
+            }
+       }
+   }
  };
\ No newline at end of file
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_836.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_836.sparql
index b921d42..ed13367 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_836.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_836.sparql
@@ -163,7 +163,7 @@ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
  PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
  INSERT {
-     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::aatplus> {
          ?record aocat:has_derived_subject ?aat .
      }
  }
@@ -194,22 +194,28 @@ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  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#> 
- INSERT {
-     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
+ PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
+INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::periodoplus> {
          ?temporal aocat:has_period ?periodO .
          ?temporal aocat:from ?temporalFrom .
          ?temporal aocat:until ?temporalUntil .
      }
  }
  WHERE {
- 	?temporal aocat:has_native_period ?native_period .
-     ?native_period skos:prefLabel ?native_label .
-     optional {
-         ?periodO skos:altLabel ?native_label .
-         ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
-         ?periodO time:intervalStartedBy ?intervalStartedBy .
-         ?intervalStartedBy skos:prefLabel ?temporalFrom .
-         ?periodO time:intervalFinishedBy ?intervalFinishedBy .
-         ?intervalFinishedBy skos:prefLabel ?temporalUntil .
-     }
- };
\ No newline at end of file
+ 	GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+       ?temporal aocat:has_native_period ?native_period .
+        ?native_period skos:prefLabel ?native_label .
+        optional {
+            GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::periodo> {
+                ?periodO skos:altLabel ?native_label .
+                ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
+                ?periodO time:intervalStartedBy ?intervalStartedBy .
+                ?intervalStartedBy skos:prefLabel ?temporalFrom .
+                ?periodO time:intervalFinishedBy ?intervalFinishedBy .
+                ?intervalFinishedBy skos:prefLabel ?temporalUntil .
+            }
+       }
+   }
+ };
+