From e597ba2564750e4c55bd700955f7c6cfd398309e Mon Sep 17 00:00:00 2001 From: Philip Trembath Date: Tue, 7 Nov 2023 14:00:58 +0000 Subject: [PATCH 1/7] fixed duplicate contact ids in ttl --- templates/rdf/_macros.ftlh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/templates/rdf/_macros.ftlh b/templates/rdf/_macros.ftlh index 2b4959a5b..f393484d1 100644 --- a/templates/rdf/_macros.ftlh +++ b/templates/rdf/_macros.ftlh @@ -12,9 +12,14 @@ <#macro contactList contacts prefix="c"> + <#assign contactSeq = 0 > <#if contacts?has_content> <#list contacts as contact> - <#assign contactIdentifier="_:" + prefix + contact?counter> + + <#if !contact.nameIdentifier?has_content && !contact.nameIdentifier?matches("^http(|s)://orcid.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$")> + <#assign contactSeq = contactSeq + 1> + + <#assign contactIdentifier="_:" + id + "_" + prefix + contactSeq> <#if contact.individualName?has_content> <#if contact.nameIdentifier?has_content && contact.nameIdentifier?matches("^http(|s)://orcid.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$")> @@ -32,9 +37,15 @@ <#macro contactDetail contacts prefix="c"> + <#assign contactSeq = 0 > <#if contacts?has_content> <#list contacts as contact> - <#assign contactIdentifier="_:" + prefix + contact?counter> + + <#if !contact.nameIdentifier?has_content && !contact.nameIdentifier?matches("^http(|s)://orcid.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$")> + <#assign contactSeq = contactSeq + 1> + + + <#assign contactIdentifier="_:" + id + "_" + prefix + contactSeq> <#if contact.individualName?has_content> <#assign contactType="vcard:Individual"> From 447c2047d8ea998d14cb0ce4660d13122e37db74 Mon Sep 17 00:00:00 2001 From: Philip Trembath Date: Wed, 8 Nov 2023 11:27:38 +0000 Subject: [PATCH 2/7] added lineage to ttl model --- templates/rdf/_body.ftlh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/rdf/_body.ftlh b/templates/rdf/_body.ftlh index 6b3b3708f..881e3ebfe 100644 --- a/templates/rdf/_body.ftlh +++ b/templates/rdf/_body.ftlh @@ -3,6 +3,12 @@ <#if description?has_content> dct:description "${description?replace("\n", " ")}" ; + + <#if lineage?has_content> + dct:provenance [ a dct:ProvenanceStatement ; + rdfs:label "${lineage?replace("\n", " ")}" ] ; + + <#if boundingBoxes?has_content && boundingBoxes?has_content> <#list boundingBoxes as extent> dct:spatial "${extent.wkt}"^^geo:wktLiteral ; From 4fd4bed278957c336cbe8359deaba1582d73e16b Mon Sep 17 00:00:00 2001 From: Philip Trembath Date: Fri, 10 Nov 2023 10:09:35 +0000 Subject: [PATCH 3/7] fixed button text wrapping error --- web/less/metadata.less | 1 + 1 file changed, 1 insertion(+) diff --git a/web/less/metadata.less b/web/less/metadata.less index 5cf318182..5fd57d058 100644 --- a/web/less/metadata.less +++ b/web/less/metadata.less @@ -327,6 +327,7 @@ .onlineResourceLinks { margin: 2em 0; .btn { + white-space: balance; margin: 0.8em 0; color: white; From 66cfdfc34a7a6fc2eaa302a1d8fd01a686c35f5d Mon Sep 17 00:00:00 2001 From: Philip Trembath Date: Mon, 20 Nov 2023 15:40:34 +0000 Subject: [PATCH 4/7] added contact?index --- templates/rdf/_macros.ftlh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/rdf/_macros.ftlh b/templates/rdf/_macros.ftlh index f393484d1..47b8067c7 100644 --- a/templates/rdf/_macros.ftlh +++ b/templates/rdf/_macros.ftlh @@ -16,11 +16,7 @@ <#if contacts?has_content> <#list contacts as contact> - <#if !contact.nameIdentifier?has_content && !contact.nameIdentifier?matches("^http(|s)://orcid.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$")> - <#assign contactSeq = contactSeq + 1> - - <#assign contactIdentifier="_:" + id + "_" + prefix + contactSeq> - + <#assign contactIdentifier="_:" + id + "_" + prefix + contact?index> <#if contact.individualName?has_content> <#if contact.nameIdentifier?has_content && contact.nameIdentifier?matches("^http(|s)://orcid.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$")> <#assign contactIdentifier= "\l" + contact.nameIdentifier + "\g"> From 2da45ffdfbf07ec4c694dd2875c5cf73f6cced71 Mon Sep 17 00:00:00 2001 From: Philip Trembath Date: Mon, 20 Nov 2023 15:46:31 +0000 Subject: [PATCH 5/7] updated rdf macro --- templates/rdf/_macros.ftlh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/templates/rdf/_macros.ftlh b/templates/rdf/_macros.ftlh index 47b8067c7..2f6ee933b 100644 --- a/templates/rdf/_macros.ftlh +++ b/templates/rdf/_macros.ftlh @@ -12,7 +12,6 @@ <#macro contactList contacts prefix="c"> - <#assign contactSeq = 0 > <#if contacts?has_content> <#list contacts as contact> @@ -33,16 +32,10 @@ <#macro contactDetail contacts prefix="c"> - <#assign contactSeq = 0 > <#if contacts?has_content> <#list contacts as contact> - <#if !contact.nameIdentifier?has_content && !contact.nameIdentifier?matches("^http(|s)://orcid.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$")> - <#assign contactSeq = contactSeq + 1> - - - <#assign contactIdentifier="_:" + id + "_" + prefix + contactSeq> - + <#assign contactIdentifier="_:" + id + "_" + prefix + contact?index> <#if contact.individualName?has_content> <#assign contactType="vcard:Individual"> <#assign contactName=contact.individualName> From c0283b7d588779d3aab9bdef23260d005a9cb98d Mon Sep 17 00:00:00 2001 From: Philip Trembath Date: Tue, 21 Nov 2023 13:01:55 +0000 Subject: [PATCH 6/7] changed blank node in ttl --- templates/rdf/_macros.ftlh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/rdf/_macros.ftlh b/templates/rdf/_macros.ftlh index 2f6ee933b..a67226983 100644 --- a/templates/rdf/_macros.ftlh +++ b/templates/rdf/_macros.ftlh @@ -15,7 +15,7 @@ <#if contacts?has_content> <#list contacts as contact> - <#assign contactIdentifier="_:" + id + "_" + prefix + contact?index> + <#assign contactIdentifier= id + "_" + prefix + contact?index> <#if contact.individualName?has_content> <#if contact.nameIdentifier?has_content && contact.nameIdentifier?matches("^http(|s)://orcid.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$")> <#assign contactIdentifier= "\l" + contact.nameIdentifier + "\g"> @@ -35,7 +35,7 @@ <#if contacts?has_content> <#list contacts as contact> - <#assign contactIdentifier="_:" + id + "_" + prefix + contact?index> + <#assign contactIdentifier= id + "_" + prefix + contact?index> <#if contact.individualName?has_content> <#assign contactType="vcard:Individual"> <#assign contactName=contact.individualName> From 7f36079f8080870aea8cdb47ec307baa14400308 Mon Sep 17 00:00:00 2001 From: Philip Trembath Date: Fri, 24 Nov 2023 10:30:43 +0000 Subject: [PATCH 7/7] fixed typo in ttl macro --- templates/rdf/_macros.ftlh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/rdf/_macros.ftlh b/templates/rdf/_macros.ftlh index a67226983..c18c3ca36 100644 --- a/templates/rdf/_macros.ftlh +++ b/templates/rdf/_macros.ftlh @@ -15,7 +15,7 @@ <#if contacts?has_content> <#list contacts as contact> - <#assign contactIdentifier= id + "_" + prefix + contact?index> + <#assign contactIdentifier= ":" + id + "_" + prefix + contact?index> <#if contact.individualName?has_content> <#if contact.nameIdentifier?has_content && contact.nameIdentifier?matches("^http(|s)://orcid.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$")> <#assign contactIdentifier= "\l" + contact.nameIdentifier + "\g"> @@ -35,7 +35,7 @@ <#if contacts?has_content> <#list contacts as contact> - <#assign contactIdentifier= id + "_" + prefix + contact?index> + <#assign contactIdentifier= ":" + id + "_" + prefix + contact?index> <#if contact.individualName?has_content> <#assign contactType="vcard:Individual"> <#assign contactName=contact.individualName>