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

Merge r1390-1395 from rel-1.1.-maint: custom sorting and collation

Browse source
This commit is contained in:
rjy7 2010-09-28 15:02:39 +00:00
parent cf56748128
commit 9a918e911f
4 changed files with 65 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
productMods/templates/entity/positionShortView.jsp
View file

@ -4,22 +4,27 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://vitro.mannlib.cornell.edu/vitro/tags/StringProcessorTag" prefix="p" %>
<jsp:useBean id="now" class="org.joda.time.DateTime"/>
<c:choose>
<c:when test="${!empty individual}"><%-- individual is the OBJECT of the property referenced -- the Position, not the Person or Organization --%>
<c:set var="startYear" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#startYear'].dataPropertyStatements[0].data}"/>
<c:set var="endYear" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#endYear'].dataPropertyStatements[0].data}"/>
<c:if test="${!empty startYear}">
<c:choose>
<c:when test="${!empty endYear}">
<c:set var="timeSpan" value=", ${startYear} - ${endYear}"/>
</c:when>
<c:otherwise>
<c:set var="timeSpan" value=", ${startYear} - "/>
</c:otherwise>
</c:choose>
</c:if>
<c:choose>
<c:when test="${! empty startYear}">
<c:choose>
<c:when test="${! empty endYear}">
<c:set var="timeSpan" value=", ${startYear} - ${endYear}"/>
</c:when>
<c:otherwise>
<c:set var="timeSpan" value=", ${startYear} - "/>
</c:otherwise>
</c:choose>
</c:when>
<c:when test="${! empty endYear}">
<c:set var="timeSpan" value=", - ${endYear}" />
</c:when>
</c:choose>
<c:choose><%-- use working title in preference to HR title --%>
<c:when test="${!empty individual.dataPropertyMap['http://vivoweb.org/ontology/core#titleOrRole'].dataPropertyStatements[0].data}">