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

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

Browse source
This commit is contained in:
rjy7 2010-07-23 18:09:25 +00:00
parent ac2ac78ec8
commit 54da0ca235
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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="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:set var="errorMsg" value=""/>
<c:choose> <c:choose>
<c:when test="${!empty individual}"><%-- individual is the OBJECT of the property referenced -- the Role individual, not the Person or grant --%> <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 --%> <%-- get years off role --%>
<c:set var="startYear" value="${individual.dataPropertyMap[startYearPredicate].dataPropertyStatements[0].data}"/> <c:set var="startYear" value="${individual.dataPropertyMap[startYearPredicate].dataPropertyStatements[0].data}"/>
<c:if test="${not empty startYear}"> <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="${showDateRange}">
<c:if test="${not empty endYear }"> <c:set var="endYear" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#endYear'].dataPropertyStatements[0].data}"/>
<c:set var="endYear">-${endYear}</c:set> <c:set var="endYearVal" value = " -" />
<c:if test="${! empty endYear}">
<c:set var="endYearVal" value="${endYearVal} ${endYear}" />
</c:if>
</c:if> </c:if>
</c:if> </c:if>
@ -112,7 +116,7 @@ Optional vars:
<c:choose> <c:choose>
<c:when test="${!empty uri}"> <c:when test="${!empty uri}">
<c:url var="olink" value="/entity"><c:param name="uri" value="${uri}"/></c:url> <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:when>
<c:otherwise> <c:otherwise>
<p:process><strong>${name}</strong> ${label}</p:process> ${errorMsg} <p:process><strong>${name}</strong> ${label}</p:process> ${errorMsg}