From a98b77762c7d3540eae45b039cedd3f35a28ec64 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 13 Apr 2011 16:14:49 +0000
Subject: [PATCH] NIHVIVO-2480 Fix core:hasRole list view so an activity with
 no rdfs:label can be returned by the query

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

diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml
index 1a9b9ed4..e4a82741 100644
--- a/productMods/config/listViewConfig-hasRole.xml
+++ b/productMods/config/listViewConfig-hasRole.xml
@@ -16,13 +16,15 @@
                         ?startDateOnly
                         ?roleLabel 
                         ?activity ?activityName 
+                        ?activityLabel
                         ?dateTimeStart ?dateTimeEnd WHERE {
                         
             ?subject ?property ?role  
             
-            OPTIONAL { ?role core:roleIn ?activity . 
-                       ?activity rdfs:label ?activityName 
-            }
+            OPTIONAL {  ?role core:roleIn ?activity 
+                        LET (?activityName := afn:localname(?activity)) 
+                        OPTIONAL { ?activity rdfs:label ?activityLabel }
+            }           
             <collated>
             OPTIONAL { ?role a ?subclass .
                        ?subclass rdfs:subClassOf core:Role