Skip to content

Commit

Permalink
Merge branch 'EMC-62_ttl_correction' into 'develop'
Browse files Browse the repository at this point in the history
fixed duplicate contact ids in ttl

Closes EMC-62

See merge request eip/catalogue!553
  • Loading branch information
WillOnGit committed Nov 24, 2023
2 parents a7b98c3 + 7f36079 commit 9fff541
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
6 changes: 6 additions & 0 deletions templates/rdf/_body.ftlh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
<#if description?has_content>
dct:description "${description?replace("\n", " ")}" ;
</#if>

<#if lineage?has_content>
dct:provenance [ a dct:ProvenanceStatement ;
rdfs:label "${lineage?replace("\n", " ")}" ] ;
</#if>

<#if boundingBoxes?has_content && boundingBoxes?has_content>
<#list boundingBoxes as extent>
dct:spatial "${extent.wkt}"^^geo:wktLiteral ;
Expand Down
4 changes: 2 additions & 2 deletions templates/rdf/_macros.ftlh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<#macro contactList contacts prefix="c">
<#if contacts?has_content>
<#list contacts as contact>
<#assign contactIdentifier="_:" + prefix + contact?counter>

<#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">
Expand All @@ -34,8 +34,8 @@
<#macro contactDetail contacts prefix="c">
<#if contacts?has_content>
<#list contacts as contact>
<#assign contactIdentifier="_:" + prefix + contact?counter>

<#assign contactIdentifier= ":" + id + "_" + prefix + contact?index>
<#if contact.individualName?has_content>
<#assign contactType="vcard:Individual">
<#assign contactName=contact.individualName>
Expand Down
1 change: 1 addition & 0 deletions web/less/metadata.less
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@
.onlineResourceLinks {
margin: 2em 0;
.btn {
white-space: balance;
margin: 0.8em 0;
color: white;

Expand Down

0 comments on commit 9fff541

Please sign in to comment.