From 4da578acda125859a548ab204147a9784287b42e Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 31 Jan 2011 21:16:05 +0000
Subject: [PATCH] NIHVIVO-1836 Restrict subclasses that can be returned from
 the collated default list view query

---
 webapp/web/config/listViewConfig-default.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/webapp/web/config/listViewConfig-default.xml b/webapp/web/config/listViewConfig-default.xml
index 73cb92fd7..1378c39e0 100644
--- a/webapp/web/config/listViewConfig-default.xml
+++ b/webapp/web/config/listViewConfig-default.xml
@@ -10,7 +10,7 @@
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;  
           
-        SELECT ?object ?name ?moniker {
+        SELECT ?object ?name ?moniker WHERE {
             GRAPH ?g1 { ?subject ?property ?object }
             OPTIONAL { GRAPH ?g2 { ?object rdfs:label ?name } }
             OPTIONAL { GRAPH ?g3 { ?object vitro:moniker ?moniker } }
@@ -20,13 +20,14 @@
     <query-collated>    
         PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;  
+        PREFIX afn:  &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
           
-        SELECT ?subclass ?object ?name ?moniker {
-            GRAPH ?g1 { ?subject ?property ?object
-                OPTIONAL { ?object a ?subclass } 
-            }
+        SELECT ?subclass ?object ?name ?moniker WHERE {
+            GRAPH ?g1 { ?subject ?property ?object }
             OPTIONAL { GRAPH ?g2 { ?object rdfs:label ?name } }
-            OPTIONAL { GRAPH ?g3 { ?object vitro:moniker ?moniker } }           
+            OPTIONAL { GRAPH ?g3 { ?object vitro:moniker ?moniker } } 
+            OPTIONAL { GRAPH ?g4 { ?object a ?subclass } }
+            FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )                     
         } ORDER BY ?subclass      
     </query-collated>