From 9195704be99e6797274adf0faa8c46a67805e398 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 21 Dec 2010 00:00:23 +0000
Subject: [PATCH] NIHVIVO-1341, NIHVIVO-1335 Handle various error conditions in
 list view config (blank query, blank template name, template doesn't exist)

---
 .../WEB-INF/ontologies/app/listViewConfig.owl |  9 +++++++
 .../listViewConfig-authorInAuthorship.xml     | 26 +++++++++++++++++++
 .../propStatement-educationalTraining.ftl     |  1 +
 3 files changed, 36 insertions(+)
 create mode 100644 productMods/config/listViewConfig-authorInAuthorship.xml

diff --git a/productMods/WEB-INF/ontologies/app/listViewConfig.owl b/productMods/WEB-INF/ontologies/app/listViewConfig.owl
index 9a8a773c..fd44f79a 100644
--- a/productMods/WEB-INF/ontologies/app/listViewConfig.owl
+++ b/productMods/WEB-INF/ontologies/app/listViewConfig.owl
@@ -15,8 +15,17 @@
     xmlns:rdfs="&rdfs;"
     xmlns:vitro="&vitro;">
 
+    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#authorInAuthorship">
+        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-authorInAuthorship.xml</display:listViewConfigFile>
+    </rdf:Description>
+    
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#educationalTraining">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-educationalTraining.xml</display:listViewConfigFile>
     </rdf:Description>
+
+    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#informationResourceInAuthorship">
+        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-informationResourceInAuthorship.xml</display:listViewConfigFile>
+    </rdf:Description>
+    
 </rdf:RDF>
 
diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml
new file mode 100644
index 00000000..7c8352d0
--- /dev/null
+++ b/productMods/config/listViewConfig-authorInAuthorship.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<list-view-config>
+    <query>    
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;   
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
+        
+        SELECT DISTINCT ?edTraining ?org ?orgName ?degreeName ?degreeAbbr ?majorField ?deptOrSchool ?info ?dateTime WHERE {
+            ?subject ?property ?edTraining .
+            ?edTraining core:trainingAtOrganization ?org .                       
+            ?org rdfs:label ?orgName .
+            OPTIONAL { ?edTraining core:degreeEarned ?degree . }
+            OPTIONAL { ?degree rdfs:label ?degreeName . }
+            OPTIONAL { ?degree core:abbreviation ?degreeAbbr . }
+            OPTIONAL { ?edTraining core:majorField ?majorField . }
+            OPTIONAL { ?edTraining core:departmentOrSchool ?deptOrSchool . }
+            OPTIONAL { ?edTraining core:supplementalInformation ?info . }
+            OPTIONAL { ?edTraining core:hasDateTimeValue ?dateTimeValue . 
+                       ?dateTimeValue core:dateTime ?dateTime . }        
+        }  ORDER BY DESC(?dateTime)    
+    </query>
+    
+    <edit-object>edTraining</edit-object>
+    
+    <template>propStatement-authorInAuthorship.ftl</template>
+</list-view-config>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
index 98f4fd40..e593c1c2 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
@@ -18,3 +18,4 @@
 </#if>
 
 <@s.join [ degree, org, statement.deptOrSchool!, statement.info!, dateTime! ] />
+c
\ No newline at end of file