From d61c7412cee227fdae1ebc239461d8c2dc712816 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 31 Jan 2011 15:02:04 +0000
Subject: [PATCH] NIHVIVO-1727 Update collated hasRole query with same changes
 made in uncollated query

---
 productMods/config/listViewConfig-hasRole.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml
index 995b392f..c4963727 100644
--- a/productMods/config/listViewConfig-hasRole.xml
+++ b/productMods/config/listViewConfig-hasRole.xml
@@ -39,11 +39,12 @@
                         ?role (afn:localname(?role) AS ?roleName)
                         ?roleLabel 
                         ?activity ?activityName 
+                        ?activityLabel
                         ?dateTimeStart ?dateTimeEnd WHERE {
             GRAPH ?g1 { ?subject ?property ?role } 
             OPTIONAL { GRAPH ?g2 { ?role core:roleIn ?activity }
-                       GRAPH ?g3 { ?activity rdfs:label ?activityName }
-            }
+                       OPTIONAL { GRAPH ?g3 { ?activity rdfs:label ?activityLabel } }
+            }            
             OPTIONAL { GRAPH ?g4 { ?role a ?subclass }
                        GRAPH ?g5 { ?subclass rdfs:subClassOf core:Role }
             }   
@@ -56,7 +57,7 @@
                                   GRAPH ?g11 { ?dateTimeEndValue core:dateTime ?dateTimeEnd }
                        }
             }
-        } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?personName
+        } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityLabel ?activityName
     </query-collated>
     
     <template>propStatement-hasRole.ftl</template>