diff --git a/src/main/java/org/genesys2/server/model/genesys/SvalbardData.java b/src/main/java/org/genesys2/server/model/genesys/SvalbardData.java index 57e50612aab328d3f1a76ae509e47807d65fdb91..bea34c3b912d64b9d73bf19d24c81f9ee90760c0 100644 --- a/src/main/java/org/genesys2/server/model/genesys/SvalbardData.java +++ b/src/main/java/org/genesys2/server/model/genesys/SvalbardData.java @@ -33,6 +33,9 @@ public class SvalbardData implements java.io.Serializable { private String boxNo; private String taxonomy; private int version; + private Long unitId; + @Column(length = 300, nullable = true) + private String acceUrl; @Id @Column(name = "id") @@ -87,4 +90,20 @@ public class SvalbardData implements java.io.Serializable { public void setVersion(int version) { this.version = version; } + + public void setUnitId(Long unitId) { + this.unitId = unitId; + } + + public Long getUnitId() { + return unitId; + } + + public String getAcceUrl() { + return acceUrl; + } + + public void setAcceUrl(String acceUrl) { + this.acceUrl = acceUrl; + } } diff --git a/src/main/java/org/genesys2/server/service/worker/SGSVEntry.java b/src/main/java/org/genesys2/server/service/worker/SGSVEntry.java index 0f4a09c22fb90018ec2c1373d653390682032fbd..f996256f902843721dc2b3b0872772762184698f 100644 --- a/src/main/java/org/genesys2/server/service/worker/SGSVEntry.java +++ b/src/main/java/org/genesys2/server/service/worker/SGSVEntry.java @@ -31,6 +31,8 @@ class SGSVEntry implements AccessionIdentifier3 { String boxNo; String depositDate; Float quantity; + long unitId; + String acceUrl; public SGSVEntry() { } @@ -49,6 +51,8 @@ class SGSVEntry implements AccessionIdentifier3 { quantity = Float.parseFloat(entry[7]); } boxNo = entry[2]; + acceUrl = entry[11]; + unitId = Long.parseLong(entry[0]); } @Override diff --git a/src/main/java/org/genesys2/server/service/worker/SGSVUpdate.java b/src/main/java/org/genesys2/server/service/worker/SGSVUpdate.java index 66b8c8ec0b71fe875d850a2b6b32ace5ad0f6dff..574d5ffe56c55defe92702b7898ce616f84465f1 100644 --- a/src/main/java/org/genesys2/server/service/worker/SGSVUpdate.java +++ b/src/main/java/org/genesys2/server/service/worker/SGSVUpdate.java @@ -284,6 +284,10 @@ public class SGSVUpdate { svalbardData.setDepositDate(entry.depositDate); svalbardData.setQuantity(entry.quantity); svalbardData.setTaxonomy(entry.fullTaxa); + svalbardData.setUnitId(entry.unitId); + if (StringUtils.isNotBlank(entry.acceUrl)) { + svalbardData.setAcceUrl(entry.acceUrl); + } svalbards.add(svalbardData); if (updateAccession) { diff --git a/src/main/resources/content/language.properties b/src/main/resources/content/language.properties index 2e7a7b6f950aefe40c1e31f918262c79dbc5f287..9e71ad604aa448443a78a3f7f5d4e28ee28081ba 100644 --- a/src/main/resources/content/language.properties +++ b/src/main/resources/content/language.properties @@ -302,6 +302,7 @@ accession.availability.false=Not available accession.historic.true=Historic accession.historic.false=Active +accession.acceUrl=Additional accession URL accession.page.profile.title=Accession profile: {0} accession.page.resolve.title=Multiple accessions found @@ -628,3 +629,6 @@ accession.pdci.dependent-items=Depending on the population type accession.donorNumb = WIEWS code of donor institute +accession.svalbard-data.url=Svalbard database URL +accession.svalbard-data.url-title=Deposit information in SGSV database +accession.svalbard-data.url-text=View SGSV deposit information for {0} diff --git a/src/main/webapp/WEB-INF/jsp/accession/details.jsp b/src/main/webapp/WEB-INF/jsp/accession/details.jsp index 8037dca06c6237b525648e9ffd411eec0914e312..7a04af1d5561cb24f951889e8f69466177c45547 100644 --- a/src/main/webapp/WEB-INF/jsp/accession/details.jsp +++ b/src/main/webapp/WEB-INF/jsp/accession/details.jsp @@ -552,6 +552,19 @@ + + + +
@@ -578,6 +591,16 @@
${svalbardData.quantity}
+ +
+
+ +
+
+ "> +
+
+