Tags: accession-details-link and accession-details-url with DOI or ID

src/main/webapp/WEB-INF/jsp/accession/data.jsp

@@ -83,7 +83,7 @@
 				<tr class="acn ${status.count % 2 == 0 ? 'even' : 'odd'}">
 					<td class="idx-col"><c:out value="${status.count + pagedData.size * pagedData.number}" /></td>
 					<td class="sel" x-aid="${accession.id}"></td>
-					<td><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></td>
+					<td><local:accession-details-link accession="${accession}" /></td>
 					<%-- <td><a href="<c:url value="/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><c:out value="${accession.taxonomy.taxonName}" /></a></td> --%>
 					<td><c:out value="${accession.taxonomy.taxonName}" /></td>
 					<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.origin}" />"><c:out value="${accession.countryOfOrigin.name}" /></a></td> --%>

src/main/webapp/WEB-INF/jsp/accession/details-turtle.jsp

 <%@ page contentType="text/turtle;charset=UTF-8" pageEncoding="UTF-8" language="java" session="false" %><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %><%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %><%@ taglib
 	prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="local" tagdir="/WEB-INF/tags" %>
 
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix wgs84_pos: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
@@ -11,7 +12,7 @@
 @prefix germplasm: <http://purl.org/germplasm/germplasmTerm#> .
 @prefix germplasmType: <http://purl.org/germplasm/germplasmType#> .
 
-<<c:url value="http://www.genesys-pgr.org/acn/id/${accession.id}" />>
+<<local:accession-details-url accession="${accession.id}" />>
   a germplasm:GermplasmAccession;
   germplasm:germplasmID "<c:out value="${accession.id}" />";
   dc:identifier "urn:uuid:<c:out value="${accession.uuid}" />";

src/main/webapp/WEB-INF/jsp/accession/details.jsp

@@ -67,7 +67,7 @@
 						<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
 							<p property="dc:identifier">
 								<c:if test="${accession.doi ne null}">
-									<a href="<c:url value="https://www.genesys-pgr.org/${accession.doi}" />"><c:out value="${accession.doi}" /></a>
+									<a href="<c:url value="https://dx.doi.org/${accession.doi}" />"><c:out value="${accession.doi}" /></a>
 								</c:if>
 							</p>
 						</div>

src/main/webapp/WEB-INF/jsp/accession/explore-es.jsp

@@ -257,7 +257,7 @@
 				<tr class="acn ${status.count % 2 == 0 ? 'even' : 'odd'}">
 					<td class="idx-col"><c:out value="${status.count + pagedData.size * pagedData.number}" /></td>
 					<td class="sel" x-aid="${accession.id}"></td>
-					<td><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.acceNumb}" /></b></a></td>
+					<td><local:accession-details-link accession="${accession}" /></td>
 					<%-- <td><a href="<c:url value="/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><c:out value="${accession.taxonomy.sciName}" /></a></td> --%>
 					<td><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.sciName}" /></span></td>
 					<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.orgCty.iso3}" />"><c:out value="${accession.orgCty.name}" /></a></td> --%>

src/main/webapp/WEB-INF/jsp/accession/explore.jsp

@@ -418,7 +418,7 @@
         <tr class="acn ${status.count % 2 == 0 ? 'even' : 'odd'} ${accession.historic ? 'historic-record' : ''}">
             <td class="idx-col"><c:out value="${status.count + pagedData.size * pagedData.number}" /></td>
             <td class="sel" x-aid="${accession.id}" title="<spring:message code="selection.checkbox" />"></td>
-            <td><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.acceNumb}"/></b></a></td>
+            <td><local:accession-details-link accession="${accession}" /></td>
             <%--<td><a href="<c:url value="/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><c:out value="${accession.taxonomy.taxonName}" /></a></td> --%>
             <%--<td><span dir="ltr" class="sci-name"><c:out value="${accession.taxonomy.taxonName}"/></span></td>--%>
             <%--<td class="notimportant"><a href="<c:url value="/geo/${accession.origin}" />"><c:out value="${accession.countryOfOrigin.name}" /></a></td> --%>

src/main/webapp/WEB-INF/jsp/accession/explore2.jsp

@@ -193,14 +193,14 @@
                         <tr class="acn ${status.count % 2 == 0 ? 'even' : 'odd'} ${accession.historic ? 'historic-record' : ''}">
                             <td class="idx-col"><p>${status.count + pagedData.size * pagedData.number}</p></td>
                             <td><span class="sel" x-aid="${accession.id}" title="<spring:message code="selection.checkbox" />"></span></td>
-                            <td><p><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.acceNumb}"/></b></a></p></td>
+                            <td><p><local:accession-details-link accession="${accession}" /></p></td>
                             <c:forEach items="${selectedColumns}" var="col" varStatus="i">
                                 <c:choose>
                                     <c:when test="${col eq 'doi'}">
                                         <td class="notimportant <c:if test='${i.count ge 2}'>hidden-xs</c:if> <c:if test='${i.count gt 2}'>hidden-sm</c:if>">
                                         	<p>
                                         		<c:if test="${accession.doi ne null}">
-                                        			<a href="<c:url value="https://www.genesys-pgr.org/${accession.doi}" />"><c:out value="${accession.doi}" /></a>
+                                        			<a href="<c:url value="${baseUrl}/${accession.doi}" />"><c:out value="${accession.doi}" /></a>
                                         		</c:if>
                                         	</p>
                                         </td>

src/main/webapp/WEB-INF/jsp/accession/resolve.jsp

@@ -22,7 +22,7 @@
 		<tbody>
 			<c:forEach items="${accessions}" var="accession" varStatus="status">
 				<tr>
-					<td><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></td>
+					<td><local:accession-details-link accession="${accession}" /></td>
 					<td><c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" /></td>
 					<td><c:out value="${accession.taxonomy.taxonName}" /></td>
 					<td><a href="<c:url value="/wiews/${accession.institute.code}" />"><c:out value="${accession.institute.code}" /></a></td>

src/main/webapp/WEB-INF/jsp/metadata/view.jsp

@@ -124,7 +124,7 @@
 				<tr class="acn ${status.count % 2 == 0 ? 'even' : 'odd'}">
 					<td class="idx-col"><c:out value="${status.count + pagedData.size * pagedData.number}" /></td>
 					<td class="sel" x-aid="${accession.id}"></td>
-					<td><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></td>
+					<td><local:accession-details-link accession="${accession}" /></td>
 					<%-- 		<td><a href="<c:url value="/geo/${accession.origin}" />"><c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" /></a></td>
 			 --%>
 					<td><span dir="ltr" class="sci-name"><c:out escapeXml="false" value="${accession.taxonomy.taxonNameHtml}" /></span></td>

src/main/webapp/WEB-INF/jsp/request/index.jsp

@@ -60,7 +60,7 @@
 						<td class="sel ${selection.containsId(accession.id) ? 'picked' : ''}" x-aid="${accession.id}"></td>
 						<td><p><spring:message code="accession.availability.${accession.availability}" /></p></td>
 						<td><p><spring:message code="accession.historic.${accession.historic}" /></p></td>
-						<td><p><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></p></td>
+						<td><p><local:accession-details-link accession="${accession}" /></p></td>
 						<td class="notimportant"><p><c:out value="${accession.taxonomy.taxonName}" /></p></td>
 						<%-- <td class="notimportant"><c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" /></td> --%>
 						<td class="notimportant"><p><a href="<c:url value="/wiews/${accession.institute.code}" />"><c:out value="${accession.institute.code}" /></a></p></td>
@@ -87,7 +87,7 @@
 					</tr>
 					<tr>
 						<td><p><spring:message code="accession.accessionName" /></p></td>
-						<td><p><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></p></td>
+						<td><p><local:accession-details-link accession="${accession}" /></p></td>
 					</tr>
 					<tr>
 						<td class="notimportant"><p><spring:message code="accession.taxonomy" /></p></td>

src/main/webapp/WEB-INF/jsp/resolver/reverse.jsp

@@ -34,7 +34,7 @@
               <a href="<c:url value="/archive/${accession.uuid}" />"><c:out value="${accession.accessionName}" /></a>
             </c:when>
             <c:otherwise>
-              <a href="<c:url value="/acn/id/${accession.id}" />"><c:out value="${accession.accessionName}" /></a>
+              <local:accession-details-link accession="${accession}" />
             </c:otherwise>
           </c:choose>
         </div>

src/main/webapp/WEB-INF/jsp/search/accessions.jsp

@@ -62,9 +62,7 @@
 					<tr class="acn ${accession.historic ? 'historic-record' : ''}">
 						<td class="idx-col"><c:out value="${status.count + pagedData.size * pagedData.number}" /></td>
 						<td class="sel" x-aid="${accession.id}"></td>
-						<td><a href="<c:url value="/acn/id/${accession.id}" />"><b>
-							<c:out value="${accession.acceNumb}" />
-						</b></a></td>
+						<td><local:accession-details-link accession="${accession}" /></td>
 						<%-- <td><c:forEach items="${accession.aliases}" var="alias"><c:out value="${alias.name}" /> </c:forEach> --%>
 						</td>
 						<%-- <td><a href="<c:url value="/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><c:out value="${accession.taxonomy.sciName}" /></a></td> --%>

src/main/webapp/WEB-INF/jsp/search/index.jsp

@@ -49,7 +49,7 @@
 					<a href="<c:url value="/org/${searchResult.slug}" />"><c:out value="${searchResult.slug}" /></a> <c:out value="${searchResult.title}" />
 				</c:when>
 				<c:when test="${clazz eq 'Accession'}">
-					<a href="<c:url value="/acn/id/${searchResult.id}" />"><c:out value="${searchResult.accessionName}" /></a> <c:out value="${searchResult.taxonomy.taxonName} ${searchResult.instituteCode}" />
+					<local:accession-details-link accession="${searchResult}" />
 				</c:when>
 				<c:when test="${clazz eq 'AccessionAlias'}">
 					<a href="<c:url value="/acn/id/${searchResult.accession.id}" />"><c:out value="${searchResult.name}" /></a> <c:out value="${searchResult.accession.taxonomy.taxonName} ${searchResult.accession.instituteCode}" />

src/main/webapp/WEB-INF/jsp/search/index2.jsp

@@ -92,7 +92,7 @@
             <c:when test="${section eq 'accession'}">
               <td class="idx-col"><p><c:out value="${status.count + pagedData.size * pagedData.number}" /></p></td>
               <td class="sel" x-aid="${unit.id}"></td>
-              <td><p><a href="<c:url value="/acn/id/${unit.id}" />"><b><c:out value="${unit.acceNumb}" /></b></a></p></td>
+              <td><p><local:accession-details-link accession="${unit}" /></p></td>
               <td><p><c:out value="${unit.taxonomy.sciName}" /></p></td>
               <td class="notimportant"><p><c:out value="${jspHelper.getCountry(unit.orgCty.iso3).getName(pageContext.response.locale)}" /></p></td>
               <td class="notimportant"><p><spring:message code="accession.sampleStatus.${unit.sampStat}" /></p></td>

src/main/webapp/WEB-INF/jsp/search/opensearch.jsp

@@ -31,7 +31,7 @@
 	<c:forEach items="${pagedData.content}" var="accession" varStatus="status">
      <item>
        <title><c:out value="${accession.acceNumb}" /></title>
-       <link><c:url value="/acn/id/${accession.id}" /></link>
+       <link><local:accession-details-url accession="${accession}" /></link>
        <description>
        <![CDATA[
        	<b><c:out value="${accession.acceNumb}" /></b>

src/main/webapp/WEB-INF/jsp/selection/index.jsp

@@ -79,7 +79,7 @@
 							<tr id="a${accession.id}" class="acn targeted ${accession.historic ? 'historic-record' : ''} ${status.count % 2 == 0 ? 'even' : 'odd'}">
 								<td class="idx-col"><p><c:out value="${status.count + pagedData.size * pagedData.number}" /></p></td>
 								<td class="sel ${selection.containsId(accession.id) ? 'picked' : ''}" x-aid="${accession.id}"></td>
-								<td><p><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></p></td>
+								<td><p><local:accession-details-link accession="${accession}" /></p></td>
 								<td><p><c:out value="${accession.taxonomy.taxonName}" /></p></td>
 								<td class="notimportant"><p><c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" /></p></td>
 								<td class="notimportant"><p><a href="<c:url value="/wiews/${accession.institute.code}" />"><c:out value="${accession.institute.code}" /></a></p></td>
@@ -96,7 +96,7 @@
 					<tbody>
 						<tr>
 							<td><p><spring:message code="accession.accessionName" /></p></td>
-							<td><p><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></p></td>
+							<td><p><local:accession-details-link accession="${accession}" /></p></td>
 						</tr>
 					<tr>
 						<td><p><spring:message code="accession.taxonomy" /></p></td>

src/main/webapp/WEB-INF/tags/accession-details-link.tag

+<%@ tag description="Display the non-trasnslated message" pageEncoding="UTF-8" %>
+<%@ tag body-content="empty" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="local" tagdir="/WEB-INF/tags" %>
+<%@ attribute name="accession" required="true" description="Accession" rtexprvalue="true" type="java.lang.Object" %>
+
+<c:if test="${accession ne null}">
+	<a href='<local:accession-details-url accession="${accession}" />'><b><c:out value="${accession.acceNumb}"/></b></a>
+</c:if>

src/main/webapp/WEB-INF/tags/accession-details-url.tag

+<%@ tag description="Display the non-trasnslated message" pageEncoding="UTF-8" %>
+<%@ tag body-content="empty" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ attribute name="accession" required="true" description="Accession" rtexprvalue="true" type="java.lang.Object" %>
+
+<c:if test="${accession ne null}">
+	<c:if test="${accession.doi eq null}">
+		<c:url value="/acn/id/${accession.id}" />
+	</c:if>
+	<c:if test="${accession.doi ne null}">
+		<c:url value="${baseUrl}/${accession.doi}" />
+	</c:if>
+</c:if>