From 188761c52eb86ed1cd924b9e717f8fad6b724b53 Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Wed, 22 May 2013 16:48:52 -0400
Subject: [PATCH] work on VIVO-60 application ontology controls for
 property/class combinations

---
 .../ontologies/app/loadedAtStartup/vivoListViewConfig.rdf   | 6 +++++-
 productMods/config/listViewConfig-default.xml               | 4 +++-
 productMods/config/listViewConfig-hasRole.xml               | 5 +++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf b/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
index 6a134509..dc89515b 100644
--- a/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
+++ b/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
@@ -71,6 +71,10 @@
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
     </rdf:Description>
     
+    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasRole">
+        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
+    </rdf:Description>
+    
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasLeaderRole">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
     </rdf:Description>
@@ -190,4 +194,4 @@
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-scopusId.xml</display:listViewConfigFile>
     </rdf:Description>
         
-</rdf:RDF>
\ No newline at end of file
+</rdf:RDF>
diff --git a/productMods/config/listViewConfig-default.xml b/productMods/config/listViewConfig-default.xml
index 0f8bbf37..213bf31a 100644
--- a/productMods/config/listViewConfig-default.xml
+++ b/productMods/config/listViewConfig-default.xml
@@ -18,9 +18,11 @@
                ?label 
                ?localName 
                ?type
+               ?objectType
                ?title WHERE {
   
-            ?subject ?property ?object 
+            ?subject ?property ?object .
+            ?object a ?objectType
                 LET (?localName := afn:localname(?object)) 
             
             OPTIONAL { ?object rdfs:label ?label } 
diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml
index 94ab38bc..a54c13b2 100644
--- a/productMods/config/listViewConfig-hasRole.xml
+++ b/productMods/config/listViewConfig-hasRole.xml
@@ -20,7 +20,8 @@
                         ?dateTimeStart ?dateTimeEnd 
                         ?hideThis
         WHERE {                
-            ?subject ?property ?role  
+            ?subject ?property ?role .
+            ?role a ?objectType 
             
             OPTIONAL {  ?role core:roleRealizedIn ?activity 
                         LET (?activityName := afn:localname(?activity)) 
@@ -145,4 +146,4 @@
     </query-construct>
 
     <template>propStatement-hasRole.ftl</template>
-</list-view-config>
\ No newline at end of file
+</list-view-config>