litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge r1106 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-23 17:41:25 +00:00
parent 417363603d
commit 19b9076902
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
productMods/templates/entity/presenterRoleShortView.jsp
View file

@ -5,5 +5,6 @@
<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#presenterRoleOf"/>
<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
<jsp:param name="roleActivityLabel" value="presenter role"/>
<jsp:param name="startYearPredicate" value="http://vivoweb.org/ontology/core#year" />
</jsp:include>

26
productMods/templates/entity/roleShortView.jsp
View file

@ -5,17 +5,23 @@
<%@ taglib uri="http://vitro.mannlib.cornell.edu/vitro/tags/StringProcessorTag" prefix="p" %>
<%--
This short view is intended to be called to handle short views for roles
This short view is intended to be called to handle short views for roles
The following vars should be set by the jsp that is calling this short view
personToRolePredicate: URI of the person to role predicate.
roleToPersonPredicate: URI of the role to person predicate.
roleActivityToRolePredicate: URI of the activity to role predicate.
roleLabelForPerson: human readable label for person when viewing from non-person side of role. Most short views
don't specify this value because the role name is displayed instead. Grant-related short views specify
this value because there is no specific role name.
roleActivityLabel: human readable label of activity used for error messages
The following vars should be set by the jsp that is calling this short view
personToRolePredicate: URI of the person to role predicate.
roleToPersonPredicate: URI of the role to person predicate.
roleActivityToRolePredicate: URI of the activity to role predicate.
roleActivityLabel: human readable label of activity used for error messages
Optional vars:
roleLabelForPerson: human readable label for person when viewing from non-person side of role. Most short views
don't specify this value because the role name is displayed instead. Grant-related short views specify
this value because there is no specific role name.
startYearPredicate: defaults to http://vivoweb.org/ontology/core#startYear if not specified
--%>
<c:set var="startYearPredicate">${! empty param.startYearPredicate ? param.startYearPredicate : 'http://vivoweb.org/ontology/core#startYear'}</c:set>
<c:set var="errorMsg" value=""/>
<c:choose>
@ -24,7 +30,7 @@
<c:when test="${!empty predicateUri}">
<%-- get years off role --%>
<c:set var="startYear" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#startYear'].dataPropertyStatements[0].data}"/>
<c:set var="startYear" value="${individual.dataPropertyMap[startYearPredicate].dataPropertyStatements[0].data}"/>
<c:if test="${not empty startYear}">
<c:set var="endYear" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#endYear'].dataPropertyStatements[0].data}"/>
<c:if test="${not empty endYear }">