From f12eb7eb5226ca12958b510e847a53e43657d181 Mon Sep 17 00:00:00 2001
From: Enrico Ottonello <enrico.ottonello@isti.cnr.it>
Date: Tue, 18 Feb 2020 16:05:51 +0100
Subject: [PATCH] added aat collection clause

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

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
index c9d1f0f..126b31d 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
@@ -17,9 +17,11 @@ CONSTRUCT {
 ?record mine:issued ?issued .
 ?record mine:resourceType ?resourceType .   
 ?record mine:modified ?modified .   
-?record mine:nativeSubject ?ns .   
-?ns a mine:NativeSubject .   
-?ns mine:prefLabel ?nativeSbj .   
+?record mine:nativeSubject ?natSub .   
+?natSub a mine:NativeSubject .   
+?natSub mine:prefLabel ?nativeSbj .
+?natSub mine:aat ?aat .
+?aat mine:aatLabel ?aatLabel .   
 ?spatial a mine:Spatial .   
 ?record mine:spatial ?spatial .   
 ?spatial mine:placeName ?spatialPlaceName .   
@@ -44,13 +46,12 @@ CONSTRUCT {
 ?t mine:from ?from .
 ?t mine:until ?until .
 ?record mine:language ?language .   
-?record mine:partOf ?collection .   
+?record mine:partOf ?collection .
 }
-
+from named <api_________::ariadne_plus::ads::aat>
+from named <api_________::ariadne_plus::ads::idCollection>
 #from onto:explain
-
 where { 
-
     graph ?g {
 		#mandatory statements in our model, to be added in all datasources
         #?record aocat:has_title ?title ; 
@@ -67,7 +68,8 @@ where {
             }
             union
             {
-            ?record aocat:has_native_subject / skos:prefLabel ?nativeSbj .
+            ?record aocat:has_native_subject ?natSub .
+            ?natSub skos:prefLabel ?nativeSbj .
             }
             union
             {
@@ -167,9 +169,18 @@ where {
                 }
             }
             }	
-    	}   
+    	}
+        
 BIND("organization" as ?contributorType) . 
 BIND("organization" as ?publisherType) . 
 
+        filter (contains(str(?g),"ads::idCollection"))
         }
+    
+    graph <api_________::ariadne_plus::ads::aat> {
+        optional {
+        	?natSub skos:exactMatch ?aat .
+       		?aat skos:prefLabel ?aatLabel
+        }     
+    }
 }