From 440220d26aba93554bfd5a8afaaebadeb6852dbf Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 14 Jun 2012 13:40:48 +0000
Subject: [PATCH] rich-export queries for funding - pull in less information
 about the awarding organization

---
 .../WEB-INF/rich-export/funding/grantAwardedBy.sparql      | 7 +++++--
 productMods/WEB-INF/rich-export/funding/grants.sparql      | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql b/productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql
index 7e42aec2..52113cf4 100644
--- a/productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql
+++ b/productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql
@@ -1,8 +1,11 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 CONSTRUCT {
-      ?awardingOrganization ?p ?o 
+     ?investigatorRole core:roleContributesTo ?grant .
+     ?grant core:grantAwardedBy ?awardingOrganization .
+     ?awardingOrganization rdfs:label ?label 
 } WHERE {
     {
       {PERSON_URI core:hasPrincipalInvestigatorRole ?investigatorRole }
@@ -13,5 +16,5 @@ CONSTRUCT {
      ?investigatorRole core:roleContributesTo ?grant .
      ?grant a core:Grant .
      ?grant core:grantAwardedBy ?awardingOrganization .
-     ?awardingOrganization ?p ?o 
+     ?awardingOrganization rdfs:label ?label 
 }
\ No newline at end of file
diff --git a/productMods/WEB-INF/rich-export/funding/grants.sparql b/productMods/WEB-INF/rich-export/funding/grants.sparql
index de6ea2f9..a7109ecc 100644
--- a/productMods/WEB-INF/rich-export/funding/grants.sparql
+++ b/productMods/WEB-INF/rich-export/funding/grants.sparql
@@ -2,7 +2,8 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 
 CONSTRUCT {
-     ?grant ?property ?object
+     ?grant ?property ?object .
+     ?investigatorRole core:roleContributesTo ?grant .
 } WHERE {
     {
       {PERSON_URI core:hasPrincipalInvestigatorRole ?investigatorRole }