diff --git a/productMods/WEB-INF/ontologies/app/customListViews.owl b/productMods/WEB-INF/ontologies/app/customListViews.owl index 993b6648..029ae4af 100644 --- a/productMods/WEB-INF/ontologies/app/customListViews.owl +++ b/productMods/WEB-INF/ontologies/app/customListViews.owl @@ -16,7 +16,7 @@ xmlns:vitro="&vitro;"> - objectPropertyList-educationalTraining.xml + objectPropertyList-educationalTraining.xml diff --git a/productMods/config/objectPropertyList-educationalTraining.xml b/productMods/config/objectPropertyList-educationalTraining.xml index 1eff095f..3d674291 100644 --- a/productMods/config/objectPropertyList-educationalTraining.xml +++ b/productMods/config/objectPropertyList-educationalTraining.xml @@ -5,9 +5,9 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - SELECT DISTINCT ?edTraining ?organization ?degree ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTime WHERE { - ?subject ?property ?edTraining . - ?edTraining core:trainingAtOrganization ?organization . + SELECT DISTINCT ?edTraining ?org ?orgName ?degreeName ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTime WHERE { + ?edTraining core:trainingAtOrganization ?org . + ?org rdfs:label ?orgName OPTIONAL { ?edTraining core:degreeEarned ?degree . } OPTIONAL { ?degree rdfs:label ?degreeName . } OPTIONAL { ?degree core:abbreviation ?degreeAbbr . } @@ -15,7 +15,7 @@ OPTIONAL { ?degree core:departmentOrSchool ?deptOrSchool . } OPTIONAL { ?degree core:supplementalInformation ?info . } OPTIONAL { ?edTraining core:dateTimeInterval ?interval . } - OPTIONAL { ?interval core:hasDateTimeValue ?dateTime . } + OPTIONAL { ?interval core:hasDateTimeValue ?dateTime . } } ORDER BY DESC(?dateTime)