From d52ad32f68661afb44ba255875240d1ed2d59c59 Mon Sep 17 00:00:00 2001
From: Enrico Ottonello <enrico.ottonello@isti.cnr.it>
Date: Fri, 20 Mar 2020 17:46:55 +0100
Subject: [PATCH] added narrow and broad for aat match

---
 .../src/main/resources/query.txt              | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
index 0b8bb48..91d340f 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
@@ -52,7 +52,10 @@ CONSTRUCT {
 ?record aoprop:nativeSubject ?nativeSubject .   
 ?nativeSubject aoprop:prefLabel ?nativeSubjectPrefLabel .
 ?nativeSubject aoprop:rdfAbout ?nativeSubject .
-?nativeSubject aoprop:aatSubjectsId ?aatSubjectsId .    
+?nativeSubject aoprop:aatExactSubjectsId ?aatExactSubjectsId .
+?nativeSubject aoprop:aatCloseSubjectsId ?aatCloseSubjectsId .
+?nativeSubject aoprop:aatBroadSubjectsId ?aatBroadSubjectsId .
+?nativeSubject aoprop:aatNarrowSubjectsId ?aatNarrowSubjectsId .    
 ?record aoprop:title ?title .      
 ?record aoprop:description ?description .     
 ?record aoprop:language ?language .   
@@ -60,7 +63,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::420_event>
+from  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::271>
 where { 	
     	?record	aocat:has_language / skos:prefLabel ?language .
     	?record	aocat:has_original_id ?originalId .
@@ -78,10 +81,16 @@ where {
 	        ?record aocat:has_native_subject ?nativeSubject .
             ?nativeSubject skos:prefLabel ?nativeSubjectPrefLabel .
             optional {
-                ?nativeSubject skos:exactMatch ?aatSubjectsId .
+                ?nativeSubject skos:exactMatch ?aatExactSubjectsId .
             }
         	optional {
-                ?nativeSubject skos:closeMatch ?aatSubjectsId .  
+                ?nativeSubject skos:closeMatch ?aatCloseSubjectsId .  
+            }
+        	optional {
+                ?nativeSubject skos:broadMatch ?aatBroadSubjectsId .  
+            }
+        	optional {
+                ?nativeSubject skos:narrowMatch ?aatNarrowSubjectsId .  
             }
     	}
         optional {
@@ -96,6 +105,8 @@ 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 .