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

---
 productMods/templates/entity/roleShortView.jsp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp
index 11931b38..4cef3c96 100644
--- a/productMods/templates/entity/roleShortView.jsp
+++ b/productMods/templates/entity/roleShortView.jsp
@@ -22,7 +22,8 @@ Optional vars:
  --%>
 
 <c:set var="startYearPredicate">${! empty param.startYearPredicate ? param.startYearPredicate : 'http://vivoweb.org/ontology/core#startYear'}</c:set>
- 
+<c:set var="showDateRange">${ startYearPredicate == 'http://vivoweb.org/ontology/core#startYear' }</c:set>
+
 <c:set var="errorMsg" value=""/>
 <c:choose>
 	<c:when test="${!empty individual}"><%-- individual is the OBJECT of the property referenced -- the Role individual, not the Person or grant --%>
@@ -31,10 +32,13 @@ Optional vars:
 											
 			    <%-- get years off role --%>
 				<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 }">
-                      <c:set var="endYear">-${endYear}</c:set>
+                <c:if test="${not empty startYear}">                   
+                    <c:if test="${showDateRange}">
+                        <c:set var="endYear" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#endYear'].dataPropertyStatements[0].data}"/>
+                        <c:set var="endYearVal" value = " -" />
+                        <c:if test="${! empty endYear}">
+                            <c:set var="endYearVal" value="${endYearVal} ${endYear}" />
+                        </c:if>
                     </c:if>
                 </c:if>
                 
@@ -112,7 +116,7 @@ Optional vars:
 			    <c:choose>
 			    	<c:when test="${!empty uri}">
 			            <c:url var="olink" value="/entity"><c:param name="uri" value="${uri}"/></c:url>
-		                <a href="<c:out value="${olink}"/>">${name}</a>&nbsp;${label}&nbsp;${startYear}${endYear} ${errorMsg}
+		                <a href="<c:out value="${olink}"/>">${name}</a>&nbsp;${label}&nbsp;${startYear}${endYearVal} ${errorMsg}
 		            </c:when>
 		            <c:otherwise>
 		                <p:process><strong>${name}</strong> ${label}</p:process> ${errorMsg}