From a005328dfe6b09731b631bdd8e1931324be307cf Mon Sep 17 00:00:00 2001
From: Enrico Ottonello <enrico.ottonello@isti.cnr.it>
Date: Tue, 31 Mar 2020 11:10:41 +0200
Subject: [PATCH] fix resource type variable name

---
 .../src/main/resources/query.txt              | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
index 91d340f..812d4b7 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
@@ -6,8 +6,7 @@ PREFIX onto: <http://www.ontotext.com/>
 PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
 PREFIX time: <http://www.w3.org/2006/time#>
 
-CONSTRUCT {   
-?record aoprop:resourcetype "AriadneCatalogEntry" .   
+CONSTRUCT {     
 ?record aoprop:identifier ?record . 
 ?record aoprop:originalId ?originalId .   
 ?record aoprop:issued ?issued .
@@ -52,10 +51,7 @@ CONSTRUCT {
 ?record aoprop:nativeSubject ?nativeSubject .   
 ?nativeSubject aoprop:prefLabel ?nativeSubjectPrefLabel .
 ?nativeSubject aoprop:rdfAbout ?nativeSubject .
-?nativeSubject aoprop:aatExactSubjectsId ?aatExactSubjectsId .
-?nativeSubject aoprop:aatCloseSubjectsId ?aatCloseSubjectsId .
-?nativeSubject aoprop:aatBroadSubjectsId ?aatBroadSubjectsId .
-?nativeSubject aoprop:aatNarrowSubjectsId ?aatNarrowSubjectsId .    
+?nativeSubject aoprop:aatSubjectsId ?aatSubjectsId .    
 ?record aoprop:title ?title .      
 ?record aoprop:description ?description .     
 ?record aoprop:language ?language .   
@@ -63,7 +59,7 @@ CONSTRUCT {
 from  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::aat>
 from  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::periodo>
 from  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::periodO-En-UK>
-from  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::271>
+from  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::420_event>
 where { 	
     	?record	aocat:has_language / skos:prefLabel ?language .
     	?record	aocat:has_original_id ?originalId .
@@ -71,26 +67,18 @@ where {
     	?record	aocat:has_creator ?creator .
         ?creator aocat:has_name ?creatorName .
 	    ?record aocat:has_title ?title .
+    	?record aocat:has_type / skos:prefLabel ?resourceType .	
         optional {
 	        ?creator aocat:has_email ?creatorEmail .
     	}
-    	optional {
-        	?collection aocat:has_type / skos:prefLabel ?type .	
-    	}
     	optional {
 	        ?record aocat:has_native_subject ?nativeSubject .
             ?nativeSubject skos:prefLabel ?nativeSubjectPrefLabel .
             optional {
-                ?nativeSubject skos:exactMatch ?aatExactSubjectsId .
+                ?nativeSubject skos:exactMatch ?aatSubjectsId .
             }
         	optional {
-                ?nativeSubject skos:closeMatch ?aatCloseSubjectsId .  
-            }
-        	optional {
-                ?nativeSubject skos:broadMatch ?aatBroadSubjectsId .  
-            }
-        	optional {
-                ?nativeSubject skos:narrowMatch ?aatNarrowSubjectsId .  
+                ?nativeSubject skos:closeMatch ?aatSubjectsId .  
             }
     	}
         optional {
@@ -105,8 +93,6 @@ where {
         optional {
         	?record aocat:has_temporal_coverage ?temporal .
         	?temporal aocat:has_period / rdfs:label ?temporalPeriodName .
-        	?temporal aocat:has_period / aocat:from ?temporalFrom .
-        	?temporal aocat:has_period / aocat:until ?temporalUntil .
         }
         optional {
         	?record aocat:has_temporal_coverage ?temporal .