Merge branch '230-bug-accession-turtle' into 'master'

BUG accession-turtle

Closes #230

See merge request genesys-pgr/genesys-server!130

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" %>
+<%@ 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" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix wgs84_pos: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
@@ -12,7 +16,16 @@
 @prefix germplasm: <http://purl.org/germplasm/germplasmTerm#> .
 @prefix germplasmType: <http://purl.org/germplasm/germplasmType#> .
 
-<<local:accession-details-url accession="${accession.id}" />>
+<c:set var = "accessionDetailUrl" value=""/>
+<c:choose>
+    <c:when test="${accession.doi ne null}">
+        <c:set var = "accessionDetailUrl" value = "/${accession.doi}"/>
+    </c:when>
+    <c:otherwise>
+        <c:set var = "accessionDetailUrl" value = "/acn/id/${accession.id}"/>
+    </c:otherwise>
+</c:choose>
+  <${baseUrl}<c:out value="${fn:trim(accessionDetailUrl)}" />>
   a germplasm:GermplasmAccession;
   germplasm:germplasmID "<c:out value="${accession.id}" />";
   dc:identifier "urn:uuid:<c:out value="${accession.uuid}" />";