diff --git a/productMods/config/listViewConfig-degreeEarned.xml b/productMods/config/listViewConfig-degreeEarned.xml index 7abddc27..ad80eef3 100644 --- a/productMods/config/listViewConfig-degreeEarned.xml +++ b/productMods/config/listViewConfig-degreeEarned.xml @@ -10,23 +10,17 @@ PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - SELECT DISTINCT ?degree + SELECT DISTINCT ?awardedDegree + ?degree ?degreeName ?degreeAbbr WHERE { - ?subject ?property ?edProcess . - ?edProcess a core:EducationalProcess - OPTIONAL { ?edProcess <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . - ?awardedDegree core:relates ?degree . - ?degree a core:AcademicDegree . - ?degree rdfs:label ?degreeName - } - OPTIONAL { ?edProcess <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . - ?awardedDegree core:relates ?degree . - ?degree a core:AcademicDegree . - ?degree core:abbreviation ?degreeAbbr - } - } + ?subject ?property ?awardedDegree . + ?awardedDegree core:relates ?degree . + ?degree rdfs:label ?degreeName + + OPTIONAL { ?degree core:abbreviation ?degreeAbbr } + } @@ -34,21 +28,20 @@ PREFIX core: <http://vivoweb.org/ontology/core#> CONSTRUCT { - ?degree a core:AcademicDegree . + ?subject ?property ?awardedDegree . + ?awardedDegree core:relates ?degree . ?degree rdfs:label ?degreeName . ?degree core:abbreviation ?degreeAbbr } WHERE { { - ?subject ?property ?edProcess . - ?edProcess a core:EducationalProcess . - ?edProcess <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . + ?subject ?property ?awardedDegree . + ?awardedDegree a core:AwardedDegree . ?awardedDegree core:relates ?degree . ?degree a core:AcademicDegree . ?degree rdfs:label ?degreeName } UNION { - ?subject ?property ?edProcess . - ?edProcess a core:EducationalProcess . - ?edProcess <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . + ?subject ?property ?awardedDegree . + ?awardedDegree a core:AwardedDegree . ?awardedDegree core:relates ?degree . ?degree a core:AcademicDegree . ?degree core:abbreviation ?degreeAbbr