NIHVIVO-1727 Update collated hasRole query with same changes made in uncollated query

This commit is contained in:
rjy7 2011-01-31 15:02:04 +00:00
parent 6266db2f13
commit d61c7412ce

View file

@ -39,10 +39,11 @@
?role (afn:localname(?role) AS ?roleName) ?role (afn:localname(?role) AS ?roleName)
?roleLabel ?roleLabel
?activity ?activityName ?activity ?activityName
?activityLabel
?dateTimeStart ?dateTimeEnd WHERE { ?dateTimeStart ?dateTimeEnd WHERE {
GRAPH ?g1 { ?subject ?property ?role } GRAPH ?g1 { ?subject ?property ?role }
OPTIONAL { GRAPH ?g2 { ?role core:roleIn ?activity } 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 } OPTIONAL { GRAPH ?g4 { ?role a ?subclass }
GRAPH ?g5 { ?subclass rdfs:subClassOf core:Role } GRAPH ?g5 { ?subclass rdfs:subClassOf core:Role }
@ -56,7 +57,7 @@
GRAPH ?g11 { ?dateTimeEndValue core:dateTime ?dateTimeEnd } 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> </query-collated>
<template>propStatement-hasRole.ftl</template> <template>propStatement-hasRole.ftl</template>