diff --git a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl index 3f9771a3..c4fed45b 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl @@ -3,7 +3,7 @@
<#list affiliatedResearchAreas as firstRow> <#assign firstOrgLabel = firstRow["orgLabel"]?upper_case /> - <#assign deptLink = "${urls.base}/individual?uri=${firstRow['orgURI']}" /> + <#assign deptLink = "${urls.base}/individual?uri=${firstRow['org']}" /> <#assign i18TextString1 = "" /> <#if ( firstOrgLabel?index_of("THE") == 0 ) > <#assign i18TextString1 = "${i18n().individuals_with_researh_area_one(firstRow['orgLabel'],deptLink)}" /> diff --git a/rdf/display/everytime/vivoOrganizationDataGetters.n3 b/rdf/display/everytime/vivoOrganizationDataGetters.n3 index 581c8fb7..133b6545 100644 --- a/rdf/display/everytime/vivoOrganizationDataGetters.n3 +++ b/rdf/display/everytime/vivoOrganizationDataGetters.n3 @@ -72,8 +72,8 @@ display:getResearchAreaDataGetter ?person (str(?researchAreaLabel) AS ?raLabel) (str(?organizationLabel) AS ?orgLabel) - ?raURI - ?orgURI + ?ra + ?org WHERE { ?orgURI vivo:relatedBy ?posn . ?posn a vivo:Position . @@ -83,6 +83,8 @@ display:getResearchAreaDataGetter ?person rdfs:label ?prsnLabel . ?person vivo:hasResearchArea ?raURI . ?raURI rdfs:label ?researchAreaLabel + BIND(?raURI AS ?ra) + BIND(?orgURI AS ?org) } ORDER BY ?personLabel """ ;