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

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

diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp
index 4cef3c96..7fe7232c 100644
--- a/productMods/templates/entity/roleShortView.jsp
+++ b/productMods/templates/entity/roleShortView.jsp
@@ -32,9 +32,12 @@ Optional vars:
 											
 			    <%-- get years off role --%>
 				<c:set var="startYear" value="${individual.dataPropertyMap[startYearPredicate].dataPropertyStatements[0].data}"/>
-                <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:if test="${! empty startYear}">
+                	<c:set var="endYear" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#endYear'].dataPropertyStatements[0].data}"/>
+                    <c:if test="${startYear == endYear}">
+                        <c:set var="showDateRange" value="false" />
+                    </c:if>
+                	<c:if test="${showDateRange}">                       
                         <c:set var="endYearVal" value = " -" />
                         <c:if test="${! empty endYear}">
                             <c:set var="endYearVal" value="${endYearVal} ${endYear}" />