merging r4248 into the trunk

This commit is contained in:
tworrall 2012-08-01 14:03:11 +00:00
parent 2c460312d3
commit ff7ef0267f
4 changed files with 265 additions and 1 deletions

View file

@ -33,7 +33,9 @@
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
# Get current positions only: end date is either null or not in the past
} FILTER ( !bound(?dateTimeEnd) ||
}
NOT EXISTS { ?position core:hideFromDisplay ?hideThis }
FILTER ( !bound(?dateTimeEnd) ||
afn:substring(str(?dateTimeEnd), 0, 4) >= afn:substring(str(afn:now()), 0, 4) )
<critical-data-required>
FILTER ( bound(?person) )