merging 4217 to trunk

This commit is contained in:
tworrall 2012-07-09 16:38:49 +00:00
parent b7417f514d
commit eb21c265be

View file

@ -82,11 +82,11 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
+ " ?subject ?roleProp ?role . \n"
+ " ?roleProp rdfs:subPropertyOf core:hasResearcherRole . \n"
+ " ?role vitro:mostSpecificType ?subclass \n"
+ " OPTIONAL { ?role core:roleRealizedIn ?activity \n"
+ " OPTIONAL { ?activity rdfs:label ?label2 } \n"
+ " OPTIONAL { ?role core:roleRealizedIn ?activity . \n"
+ " ?activity rdfs:label ?label2 \n"
+ " } \n"
+ " OPTIONAL { ?role core:roleContributesTo ?activity \n"
+ " OPTIONAL { ?activity rdfs:label ?label2 } \n"
+ " OPTIONAL { ?role core:roleContributesTo ?activity . \n"
+ " ?activity rdfs:label ?label2 \n"
+ " } \n"
+ " OPTIONAL { ?role core:hideFromDisplay ?hideThis } \n"
+ "} ORDER BY ?subclass ?label2";