From 43bed0719cb9c2a6b058627569d24dd076bc70dc Mon Sep 17 00:00:00 2001 From: stellamit Date: Thu, 8 Dec 2011 19:41:26 +0000 Subject: [PATCH] NIHVIVO-3457 update rich export sparql queries for 1.4 ontology role property changes --- .../WEB-INF/rich-export/funding/grantAwardedBy.sparql | 2 +- productMods/WEB-INF/rich-export/funding/grants.sparql | 2 +- .../WEB-INF/rich-export/membership/memberRoleIn.sparql | 8 +++++++- .../WEB-INF/rich-export/outreach/outreachRoleIn.sparql | 8 +++++++- .../rich-export/presentation/meetingLocation.sparql | 2 +- .../WEB-INF/rich-export/presentation/meetingName.sparql | 2 +- .../rich-export/presentation/presenterRoleIn.sparql | 4 +++- .../WEB-INF/rich-export/teaching/teacherRoleIn.sparql | 2 +- 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql b/productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql index 3afbf296..7e42aec2 100644 --- a/productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql +++ b/productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql @@ -10,7 +10,7 @@ CONSTRUCT { {PERSON_URI core:hasCo-PrincipalInvestigatorRole ?investigatorRole } } - ?investigatorRole core:roleIn ?grant . + ?investigatorRole core:roleContributesTo ?grant . ?grant a core:Grant . ?grant core:grantAwardedBy ?awardingOrganization . ?awardingOrganization ?p ?o diff --git a/productMods/WEB-INF/rich-export/funding/grants.sparql b/productMods/WEB-INF/rich-export/funding/grants.sparql index 41a8ec96..de6ea2f9 100644 --- a/productMods/WEB-INF/rich-export/funding/grants.sparql +++ b/productMods/WEB-INF/rich-export/funding/grants.sparql @@ -10,7 +10,7 @@ CONSTRUCT { {PERSON_URI core:hasCo-PrincipalInvestigatorRole ?investigatorRole } } - ?investigatorRole core:roleIn ?grant . + ?investigatorRole core:roleContributesTo ?grant . ?grant a core:Grant . ?grant ?property ?object } \ No newline at end of file diff --git a/productMods/WEB-INF/rich-export/membership/memberRoleIn.sparql b/productMods/WEB-INF/rich-export/membership/memberRoleIn.sparql index c9e2577d..06815f0d 100644 --- a/productMods/WEB-INF/rich-export/membership/memberRoleIn.sparql +++ b/productMods/WEB-INF/rich-export/membership/memberRoleIn.sparql @@ -4,6 +4,12 @@ CONSTRUCT { ?endeavor ?property ?object . } WHERE { PERSON_URI core:hasMemberRole ?memberRole . - ?memberRole core:roleIn ?endeavor . + + { + {?memberRole core:roleRealizedIn ?endeavor } + union + {?memberRole core:roleContributesTo ?endeavor } + } + ?endeavor ?property ?object . } \ No newline at end of file diff --git a/productMods/WEB-INF/rich-export/outreach/outreachRoleIn.sparql b/productMods/WEB-INF/rich-export/outreach/outreachRoleIn.sparql index ca17417e..fd103df0 100644 --- a/productMods/WEB-INF/rich-export/outreach/outreachRoleIn.sparql +++ b/productMods/WEB-INF/rich-export/outreach/outreachRoleIn.sparql @@ -4,6 +4,12 @@ CONSTRUCT { ?endeavor ?property ?object . } WHERE { PERSON_URI core:hasOutreachProviderRole ?outreachRole . - ?outreachRole core:roleIn ?endeavor . + + { + { ?memberRole core:roleRealizedIn ?endeavor } + union + { ?memberRole core:roleContributesTo ?endeavor } + } + ?endeavor ?property ?object . } \ No newline at end of file diff --git a/productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql b/productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql index a629e584..ad73ba75 100644 --- a/productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql +++ b/productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql @@ -5,7 +5,7 @@ CONSTRUCT { ?location rdfs:label ?locationName . } WHERE { PERSON_URI core:hasPresenterRole ?presenterRole . - ?presenterRole core:roleIn ?presentation . + ?presenterRole core:roleRealizedIn ?presentation . ?presentation core:eventWithin ?containingEvent . ?containingEvent core: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 e0a392a4..e0c9c89f 100644 --- a/productMods/WEB-INF/rich-export/presentation/meetingName.sparql +++ b/productMods/WEB-INF/rich-export/presentation/meetingName.sparql @@ -5,7 +5,7 @@ CONSTRUCT { ?containingEvent rdfs:label ?containingEventName } WHERE { PERSON_URI core:hasPresenterRole ?presenterRole . - ?presenterRole core:roleIn ?presentation . + ?presenterRole core:roleRealizedIn ?presentation . ?presentation core: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 83f3d5bb..e68a7f5d 100644 --- a/productMods/WEB-INF/rich-export/presentation/presenterRoleIn.sparql +++ b/productMods/WEB-INF/rich-export/presentation/presenterRoleIn.sparql @@ -4,6 +4,8 @@ CONSTRUCT { ?presentation ?property ?object . } WHERE { PERSON_URI core:hasPresenterRole ?presenterRole . - ?presenterRole core:roleIn ?presentation . + + ?presenterRole core:roleRealizedIn ?presentation . + ?presentation ?property ?object . } \ No newline at end of file diff --git a/productMods/WEB-INF/rich-export/teaching/teacherRoleIn.sparql b/productMods/WEB-INF/rich-export/teaching/teacherRoleIn.sparql index 6df11b99..a5b55771 100644 --- a/productMods/WEB-INF/rich-export/teaching/teacherRoleIn.sparql +++ b/productMods/WEB-INF/rich-export/teaching/teacherRoleIn.sparql @@ -4,6 +4,6 @@ CONSTRUCT { ?course ?property ?object . } WHERE { PERSON_URI core:hasTeacherRole ?teacherRole . - ?teacherRole core:roleIn ?course . + ?teacherRole core:roleRealizedIn ?course . ?course ?property ?object . } \ No newline at end of file