From 19b9076902580a35e75b492dc606d2498b89b500 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 23 Jul 2010 17:41:25 +0000
Subject: [PATCH] Merge r1106 from
 http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

---
 .../entity/presenterRoleShortView.jsp         |  1 +
 .../templates/entity/roleShortView.jsp        | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/productMods/templates/entity/presenterRoleShortView.jsp b/productMods/templates/entity/presenterRoleShortView.jsp
index 1e0a8af5..b991bd39 100644
--- a/productMods/templates/entity/presenterRoleShortView.jsp
+++ b/productMods/templates/entity/presenterRoleShortView.jsp
@@ -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>
 
diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp
index 6fc220c1..11931b38 100644
--- a/productMods/templates/entity/roleShortView.jsp
+++ b/productMods/templates/entity/roleShortView.jsp
@@ -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 }">