litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging r4252 to the trunk

Browse source
This commit is contained in:
tworrall 2012-08-07 19:37:11 +00:00
parent d5624a9669
commit cefee06309
7 changed files with 76 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
productMods/config/listViewConfig-authorInAuthorship.xml
View file

@ -24,6 +24,7 @@
?appearsIn
?partOf
?editor
?hideThis
WHERE {
?subject ?property ?authorship
OPTIONAL { ?authorship core:linkedInformationResource ?infoResource .
@ -54,9 +55,10 @@
}
OPTIONAL { ?infoResource core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
}
OPTIONAL { ?authorship core:hideFromDisplay ?hideThis }
}
NOT EXISTS { ?authorship core:hideFromDisplay ?hideThis }
# NOT EXISTS { ?authorship core:hideFromDisplay ?hideThis }
<critical-data-required>
FILTER ( bound(?infoResource) )
</critical-data-required>

4
productMods/config/listViewConfig-hasInvestigatorRole.xml
View file

@ -20,6 +20,7 @@
?adminedByLabel
?dateTimeStartRole ?dateTimeEndRole
?dateTimeStartGrant ?dateTimeEndGrant
?hideThis
WHERE {
?subject ?property ?role
@ -55,7 +56,8 @@
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
}
}
NOT EXISTS { ?role core:hideFromDisplay ?hideThis }
OPTIONAL { ?role core:hideFromDisplay ?hideThis }
# NOT EXISTS { ?role core:hideFromDisplay ?hideThis }
<critical-data-required>
FILTER ( bound(?activity) )
</critical-data-required>

7
productMods/config/listViewConfig-organizationForPosition.xml
View file

@ -14,7 +14,9 @@
?position
?positionTitle
?person ?personName
?dateTimeStart ?dateTimeEnd WHERE {
?dateTimeStart ?dateTimeEnd
?hideThis
WHERE {
?subject ?property ?position
OPTIONAL { ?position core:positionForPerson ?person .
?person rdfs:label ?personName
@ -25,6 +27,7 @@
}
</collated>
OPTIONAL { ?position rdfs:label ?positionTitle }
OPTIONAL { ?position core:hideFromDisplay ?hideThis }
OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
@ -34,7 +37,7 @@
}
# Get current positions only: end date is either null or not in the past
}
NOT EXISTS { ?position core:hideFromDisplay ?hideThis }
# NOT EXISTS { ?position core:hideFromDisplay ?hideThis }
FILTER ( !bound(?dateTimeEnd) ||
afn:substring(str(?dateTimeEnd), 0, 4) &gt;= afn:substring(str(afn:now()), 0, 4) )
<critical-data-required>