From 7f93ce635804f61d8b71b9b4fa6242eaf751a5be Mon Sep 17 00:00:00 2001
From: Enrico Ottonello <enrico.ottonello@isti.cnr.it>
Date: Tue, 25 Feb 2020 16:16:06 +0100
Subject: [PATCH] from named condition modified to from because of wrong
 triples in results

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

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
index 43f7da9..ea98be1 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
@@ -1,8 +1,10 @@
+
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/> 
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#> 
 PREFIX mine: <http://www.myprefix/> 
 PREFIX onto: <http://www.ontotext.com/>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
 
 CONSTRUCT {   
 ?record mine:resourcetype "AriadneCatalogEntry" .   
@@ -18,7 +20,8 @@ CONSTRUCT {
 ?record mine:resourceType ?resourceType .   
 ?record mine:modified ?modified .   
 ?record mine:nativeSubject ?natSub .   
-?natSub a mine:NativeSubject .
+?natSub a mine:NativeSubject .   
+#?natSub mine:prefLabel ?nativeSbj .
 ?natSub mine:aat ?aat .
 ?aat mine:aatLabel ?aatLabel .   
 ?spatial a mine:Spatial .   
@@ -47,11 +50,10 @@ CONSTRUCT {
 ?record mine:language ?language .   
 ?record mine:partOf ?collection .
 }
-from named <api_________::ariadne_plus::ads::aat>
-from named <api_________::ariadne_plus::ads::idCollection>
+from  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::aat>
+from  <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::collectionId>
 #from onto:explain
 where { 
-    graph ?g {
 		#mandatory statements in our model, to be added in all datasources
         #?record aocat:has_title ?title ; 
         #   	 aocat:has_access_rights ?accessRights ;
@@ -70,6 +72,10 @@ where {
             ?record aocat:has_native_subject ?natSub .
             ?natSub skos:prefLabel ?nativeSbj .
             }
+            union {
+                ?natSub owl:sameAs ?aat .
+       			?aat skos:prefLabel ?aatLabel   
+            }
             union
             {
             ?record	aocat:has_creator / aocat:has_name ?contributorName .
@@ -172,14 +178,6 @@ 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
-        }     
-    }
 }
+
+