From 31dbc619a453fa9d9abe3f3cb4f0c3b5f64f3059 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 15 Dec 2010 16:52:59 +0000
Subject: [PATCH] NIHVIVO-1341 Get custom view config file for a property.
 NIHVIVO-1336 Sparql query for core:educationalTraining.

---
 productMods/WEB-INF/ontologies/app/customListViews.owl    | 2 +-
 .../config/objectPropertyList-educationalTraining.xml     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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;">
 
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#educationalTraining">
-        <vitro:propertyListDisplayConfiguration rdf:datatype="http://www.w3.org/2001/XMLSchema#string">objectPropertyList-educationalTraining.xml</vitro:propertyListDisplayConfiguration>
+        <display:customListViewConfigurationFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">objectPropertyList-educationalTraining.xml</display:customListViewConfigurationFile>
     </rdf:Description>
 </rdf:RDF>
 
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: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;   
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         
-        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)    
     </query>