From 70f7b3787ddd5a99cd2cf4ebb270e624ddfa5f95 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 17 Dec 2010 16:34:11 +0000
Subject: [PATCH]

---
 .../config/objectPropertyList-educationalTraining.xml      | 7 +++----
 .../partials/individual/shortView-educationalTraining.ftl  | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/productMods/config/objectPropertyList-educationalTraining.xml b/productMods/config/objectPropertyList-educationalTraining.xml
index aa942768..de2dbec8 100644
--- a/productMods/config/objectPropertyList-educationalTraining.xml
+++ b/productMods/config/objectPropertyList-educationalTraining.xml
@@ -6,8 +6,9 @@
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         
         SELECT DISTINCT ?edTraining ?org ?orgName ?degree ?degreeName ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTime WHERE {
+            ?subject ?property ?edTraining .
             ?edTraining core:trainingAtOrganization ?org .
-            ?org rdfs:label ?orgName
+            ?org rdfs:label ?orgName .
             OPTIONAL { ?edTraining core:degreeEarned ?degree . }
             OPTIONAL { ?degree rdfs:label ?degreeName . }
             OPTIONAL { ?degree core:abbreviation ?degreeAbbr . }
@@ -15,11 +16,9 @@
             OPTIONAL { ?edTraining core:departmentOrSchool ?deptOrSchool . }
             OPTIONAL { ?edTraining core:supplementalInformation ?info . }
             OPTIONAL { ?edTraining core:dateTimeInterval ?interval . }
-            OPTIONAL { ?interval core:hasDateTimeValue ?dateTime . }        
+            OPTIONAL { ?interval core:hasDateTimeValue ?dateTime . }       
         }  ORDER BY DESC(?dateTime)    
     </query>
     
-    <link-target>org</link-target>
-    
     <template>shortView-educationalTraining.ftl</template>
 </view-config>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/shortView-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/shortView-educationalTraining.ftl
index 11508a9e..73cff49b 100644
--- a/productMods/templates/freemarker/body/partials/individual/shortView-educationalTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/shortView-educationalTraining.ftl
@@ -11,7 +11,7 @@
     </#if>
 </#assign>
 
-<#assign org><a href="${statement.orgUrl}">${statement.orgName}</a></#assign>
+<#assign org><a href="${url(statement.org)}">${statement.orgName}</a></#assign>
 
 <@s.join [ degree, org, statement.deptOrSchool!, statement.info!, statement.datetime! ] />
 </#compress>
\ No newline at end of file