litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-12-19 10:37:01 -05:00
commit d34cd74fb9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl
View file

@ -3,7 +3,7 @@
<section id="pageList"> <section id="pageList">
<#list affiliatedResearchAreas as firstRow> <#list affiliatedResearchAreas as firstRow>
<#assign firstOrgLabel = firstRow["orgLabel"]?upper_case /> <#assign firstOrgLabel = firstRow["orgLabel"]?upper_case />
<#assign deptLink = "${urls.base}/individual?uri=${firstRow['orgURI']}" /> <#assign deptLink = "${urls.base}/individual?uri=${firstRow['org']}" />
<#assign i18TextString1 = "" /> <#assign i18TextString1 = "" />
<#if ( firstOrgLabel?index_of("THE") == 0 ) > <#if ( firstOrgLabel?index_of("THE") == 0 ) >
<#assign i18TextString1 = "${i18n().individuals_with_researh_area_one(firstRow['orgLabel'],deptLink)}" /> <#assign i18TextString1 = "${i18n().individuals_with_researh_area_one(firstRow['orgLabel'],deptLink)}" />

6
rdf/display/everytime/vivoOrganizationDataGetters.n3
View file

@ -72,8 +72,8 @@ display:getResearchAreaDataGetter
?person ?person
(str(?researchAreaLabel) AS ?raLabel) (str(?researchAreaLabel) AS ?raLabel)
(str(?organizationLabel) AS ?orgLabel) (str(?organizationLabel) AS ?orgLabel)
?raURI ?ra
?orgURI ?org
WHERE { WHERE {
?orgURI vivo:relatedBy ?posn . ?orgURI vivo:relatedBy ?posn .
?posn a vivo:Position . ?posn a vivo:Position .
@ -83,6 +83,8 @@ display:getResearchAreaDataGetter
?person rdfs:label ?prsnLabel . ?person rdfs:label ?prsnLabel .
?person vivo:hasResearchArea ?raURI . ?person vivo:hasResearchArea ?raURI .
?raURI rdfs:label ?researchAreaLabel ?raURI rdfs:label ?researchAreaLabel
BIND(?raURI AS ?ra)
BIND(?orgURI AS ?org)
} }
ORDER BY ?personLabel ORDER BY ?personLabel
""" ; """ ;