From a8aa5ec6ed3973ec67847503f1e5ae679b1ab2e4 Mon Sep 17 00:00:00 2001
From: Enrico Ottonello <enrico.ottonello@isti.cnr.it>
Date: Wed, 4 Mar 2020 13:27:31 +0100
Subject: [PATCH] added legalResponsible, owner

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

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
index 9de7d47..67ebca1 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/query.txt
@@ -20,10 +20,18 @@ CONSTRUCT {
 ?record mine:contributor ?contributor .   
 ?contributor mine:name ?contributorName .
 ?contributor mine:email ?contributorEmail .
-?contributor mine:type ?contributorType . 
-?record mine:publisher ?x .   
-?x mine:name ?publisherName .   
-?x mine:type ?publisherType .   
+?record mine:legalResponsible ?legalResponsible .   
+?legalResponsible mine:name ?legalResponsibleName .
+?legalResponsible mine:email ?legalResponsibleEmail .  
+?record mine:owner ?owner .   
+?owner mine:name ?ownerName .
+?owner mine:email ?ownerEmail . 
+?record mine:publisher ?publisher .   
+?publisher mine:name ?publisherName .   
+?publisher mine:email ?publisherEmail .  
+?record mine:accessPolicy ?accessPolicy . 
+?record mine:accessRights ?accessRights .
+?record mine:landingPage ?landingPage .      
 ?record mine:archeologicalResourceType ?archeologicalResourceType .   
 ?archeologicalResourceType mine:name ?archeologicalResourceTypeName .   
 ?record mine:resourceType ?resourceType .   
@@ -36,11 +44,8 @@ CONSTRUCT {
 ?spatial mine:placeName ?spatialPlaceName .   
 ?spatial mine:location ?blocation .    
 ?blocation mine:lat ?spatialLocationLat .   
-?blocation mine:lon ?spatialLocationLon .   
-?record mine:accessPolicy ?accessPolicy .   
-?record mine:landingPage ?landingPage .   
-?record mine:title ?title .   
-?record mine:accessRights ?accessRights .   
+?blocation mine:lon ?spatialLocationLon .      
+?record mine:title ?title .      
 ?record mine:description ?description .     
 ?record mine:temporal ?t .  
 ?t mine:periodName ?temporalPeriodName .
@@ -73,18 +78,20 @@ where {
             }
             union
             {
-            ?record	aocat:has_creator / aocat:has_name ?creatorName .
+            ?record	aocat:has_creator ?creator .
+            ?creator aocat:has_name ?creatorName .
             }
-            union
+        	union
+            {
+            ?record	aocat:has_creator ?creator .
+            ?creator aocat:has_email ?creatorEmail .
+            }    
+        	union
             {
             ?record aocat:has_title ?title .
             }
             union
             {
-            ?record aocat:has_creator / aocat:has_email ?creatorEmail .
-            }
-            union
-            {
             ?record aocat:has_access_rights ?accessRights .
             }
             union
@@ -93,7 +100,8 @@ where {
             }
             union
             {
-            ?record aocat:has_access_policy / rdfs:label ?accessPolicy . 
+            ?record aocat:has_access_policy ?ap .
+            ?ap rdfs:label ?accessPolicy . 
             }
             union
             {
@@ -125,13 +133,31 @@ where {
             ?record aocat:is_part_of ?collection .
             ?collection aocat:was_issued ?issued .
             ?collection aocat:was_modified ?modified .
-            ?collection aocat:has_contributor / aocat:has_name ?contributorName .
+            ?collection aocat:has_contributor ?contributor .
+            ?contributor aocat:has_name ?contributorName .
+            ?collection aocat:has_responsible ?legalResponsible .
+            ?legalResponsible aocat:has_name ?legalResponsibleName .
+            ?collection aocat:has_owner ?owner .
+            ?owner aocat:has_name ?ownerName .
             optional {
                 {
                 ?collection aocat:has_contributor / aocat:has_email ?contributorEmail .  
                 }
+                union
                 {
-                ?collection aocat:has_publisher / rdfs:label ?publisherName .    
+                ?collection aocat:has_responsible / aocat:has_email ?legalResponsibleEmail .    
+                }
+                union
+                {
+                ?collection aocat:has_owner / aocat:has_email ?ownerEmail .    
+                }
+                union
+                {
+                ?collection aocat:has_publisher ?publisher . 
+                ?publisher aocat:has_name ?publisherName .
+                    optional {
+                        ?publisher aocat:has_email ?publisherEmail .
+                    }
                 }
                 union 
                 {
@@ -142,6 +168,10 @@ where {
                 {
                 ?collection aocat:has_type / skos:prefLabel ?type .     
                 }
+                union
+                {
+                ?collection aocat:has_access_rights ?accessRights .     
+                }
             }
             #?archeologicalResourceType skos:prefLabel ?archeologicalResourceTypeName .
 			}
@@ -169,4 +199,4 @@ where {
 BIND("organization" as ?contributorType) . 
 BIND("organization" as ?publisherType) . 
 
-}
\ No newline at end of file
+}