From 5e69b3ac2953403dfdc05b735b3f7cbfb77dc124 Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 21 Jun 2012 13:56:07 +0000
Subject: [PATCH] updating sparql for rich-export of presentations

---
 .../presentation/meetingLocation.sparql        | 14 +++++++++-----
 .../presentation/meetingName.sparql            | 12 ++++++++----
 .../presentation/presenterRoleIn.sparql        | 18 ++++++++++++------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql b/productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql
index ad73ba75..cb110302 100644
--- a/productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql
+++ b/productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql
@@ -1,12 +1,16 @@
-PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 CONSTRUCT {
      ?location rdfs:label ?locationName .
 } WHERE {
-     PERSON_URI core:hasPresenterRole ?presenterRole .
-     ?presenterRole core:roleRealizedIn ?presentation .
-     ?presentation core:eventWithin ?containingEvent .
-     ?containingEvent core:hasGeographicLocation ?location .
+     PERSON_URI vivo:hasPresenterRole ?presenterRole .
+
+     {?presenterRole vivo:roleRealizedIn ?presentation}
+        union
+     {?presenterRole vivo:roleIn ?presentation}   
+
+     ?presentation vivo:eventWithin ?containingEvent .
+     ?containingEvent vivo:hasGeographicLocation ?location .
      ?location rdfs:label ?locationName .
 }
diff --git a/productMods/WEB-INF/rich-export/presentation/meetingName.sparql b/productMods/WEB-INF/rich-export/presentation/meetingName.sparql
index e0c9c89f..8ca7c752 100644
--- a/productMods/WEB-INF/rich-export/presentation/meetingName.sparql
+++ b/productMods/WEB-INF/rich-export/presentation/meetingName.sparql
@@ -1,11 +1,15 @@
-PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 CONSTRUCT {
      ?containingEvent rdfs:label ?containingEventName
 } WHERE {
-     PERSON_URI core:hasPresenterRole ?presenterRole .
-     ?presenterRole core:roleRealizedIn ?presentation .
-     ?presentation core:eventWithin ?containingEvent .
+     PERSON_URI vivo:hasPresenterRole ?presenterRole .
+ 
+     {?presenterRole vivo:roleRealizedIn ?presentation}
+        union
+     {?presenterRole vivo:roleIn ?presentation}   
+
+     ?presentation vivo:eventWithin ?containingEvent .
      ?containingEvent rdfs:label ?containingEventName
 }
\ No newline at end of file
diff --git a/productMods/WEB-INF/rich-export/presentation/presenterRoleIn.sparql b/productMods/WEB-INF/rich-export/presentation/presenterRoleIn.sparql
index e68a7f5d..c733e94c 100644
--- a/productMods/WEB-INF/rich-export/presentation/presenterRoleIn.sparql
+++ b/productMods/WEB-INF/rich-export/presentation/presenterRoleIn.sparql
@@ -1,11 +1,17 @@
-PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 CONSTRUCT {
-     ?presentation ?property ?object .
+     ?presentation rdfs:label ?presentationTitle . 
+     ?presenterRole rdfs:label ?roleLabel .
 } WHERE {
-     PERSON_URI core:hasPresenterRole ?presenterRole .
+     PERSON_URI vivo:hasPresenterRole ?presenterRole .
+          
+     optional {?presenterRole rdfs:label ?roleLabel}
+          
+     {?presenterRole vivo:roleRealizedIn ?presentation}
+        union
+     {?presenterRole vivo:roleIn ?presentation}   
      
-     ?presenterRole core:roleRealizedIn ?presentation .
-     
-     ?presentation ?property ?object .
+     ?presentation rdfs:label ?presentationTitle .
 }
\ No newline at end of file