diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml index 7fc20bd5..0dbd5ed3 100644 --- a/productMods/config/listViewConfig-authorInAuthorship.xml +++ b/productMods/config/listViewConfig-authorInAuthorship.xml @@ -28,7 +28,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - SELECT DISTINCT ?subClass ?authorship (afn:localname(?authorship) AS ?authorshipName) + SELECT DISTINCT ?subclass ?authorship (afn:localname(?authorship) AS ?authorshipName) ?infoResource ?infoResourceName ?dateTime WHERE { GRAPH ?g1 { ?subject ?property ?authorship } GRAPH ?g2 { ?authorship core:linkedInformationResource ?infoResource } @@ -36,8 +36,8 @@ OPTIONAL { GRAPH ?g4 { ?subclass rdfs:subClassOf core:InformationResource } GRAPH ?g5 { ?infoResource a ?subclass } } OPTIONAL { GRAPH ?g6 { ?infoResource core:hasDateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime . } } - } ORDER BY ?subClass DESC(?dateTime) ?infoResourceName + ?dateTimeValue core:dateTime ?dateTime . } } + } ORDER BY ?subclass DESC(?dateTime) ?infoResourceName diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl index 061a7717..e386ab95 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl @@ -10,7 +10,7 @@ ${statement.infoResourceName} <#else> <#-- This shouldn't happen, but we must provide for it --> - (no linked publication) ${statement.authorshipName} + ${statement.authorshipName} (no linked information resource) diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl index d7f2a0be..3e123cbd 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl @@ -16,7 +16,7 @@ ${statement.orgName} <#else> <#-- This shouldn't happen, but we must provide for it --> - (no linked organization) ${statement.edTrainingName} + ${statement.edTrainingName} (no linked organization)