Merge branch 'maint-rel-1.6' into develop
This commit is contained in:
commit
d0e57e586c
2 changed files with 180 additions and 174 deletions
|
@ -1,168 +1,174 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
|
||||
|
||||
<list-view-config>
|
||||
<query-select>
|
||||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
|
||||
PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
|
||||
|
||||
SELECT DISTINCT <collated>?subclass</collated>
|
||||
?position
|
||||
?positionTitle
|
||||
?hrJobTitle
|
||||
?rank
|
||||
?org ?orgName
|
||||
?middleOrg ?middleOrgName
|
||||
?outerOrg ?outerOrgName
|
||||
?dateTimeStart ?dateTimeEnd WHERE {
|
||||
?subject ?property ?position
|
||||
OPTIONAL { ?position core:relates ?org .
|
||||
?org rdfs:label ?orgName
|
||||
OPTIONAL { ?org core:subOrganizationWithin ?middleOrg .
|
||||
?middleOrg rdfs:label ?middleOrgName
|
||||
OPTIONAL { ?middleOrg core:subOrganizationWithin ?outerOrg .
|
||||
?outerOrg rdfs:label ?outerOrgName
|
||||
}
|
||||
}
|
||||
}
|
||||
OPTIONAL { ?position rdfs:label ?positionTitle }
|
||||
OPTIONAL { ?position core:hrJobTitle ?hrJobTitle }
|
||||
OPTIONAL { ?position core:rank ?rank }
|
||||
OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
|
||||
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
|
||||
?dateTimeStartValue core:dateTime ?dateTimeStart
|
||||
}
|
||||
OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
|
||||
?dateTimeEndValue core:dateTime ?dateTimeEnd
|
||||
}
|
||||
}
|
||||
<collated>
|
||||
OPTIONAL { ?position vitro:mostSpecificType ?subclass .
|
||||
?subclass rdfs:subClassOf core:Position
|
||||
}
|
||||
</collated>
|
||||
<critical-data-required>
|
||||
FILTER ( bound(?org) )
|
||||
</critical-data-required>
|
||||
} ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) ?rank
|
||||
</query-select>
|
||||
|
||||
<query-construct>
|
||||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
|
||||
CONSTRUCT {
|
||||
?subject ?property ?position .
|
||||
?position vitro:mostSpecificType ?subclass .
|
||||
?subclass rdfs:subClassOf core:Position
|
||||
} WHERE {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position vitro:mostSpecificType ?subclass .
|
||||
?subclass rdfs:subClassOf core:Position
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
<query-construct>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
|
||||
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
|
||||
CONSTRUCT {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position ?positionProperty ?positionValue .
|
||||
?org rdfs:label ?orgName .
|
||||
?org core:subOrganizationWithin ?middleOrg .
|
||||
?middleOrg rdfs:label ?middleOrgName .
|
||||
?middleOrg core:subOrganizationWithin ?outerOrg .
|
||||
?outerOrg rdfs:label ?outerOrgName
|
||||
} WHERE {
|
||||
{
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position ?positionProperty ?positionValue
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:rank ?rank
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:relates ?org .
|
||||
?org a foaf:Organization .
|
||||
?org rdfs:label ?orgName
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:relates ?org .
|
||||
?org a foaf:Organization .
|
||||
?org core:subOrganizationWithin ?middleOrg
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:relates ?org .
|
||||
?org a foaf:Organization .
|
||||
?org core:subOrganizationWithin ?middleOrg .
|
||||
?middleOrg rdfs:label ?middleOrgName
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:relates ?org .
|
||||
?org a foaf:Organization .
|
||||
?org core:subOrganizationWithin ?middleOrg .
|
||||
?middleOrg core:subOrganizationWithin ?outerOrg
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:positionInOrganization ?org .
|
||||
?org a foaf:Organization .
|
||||
?org core:subOrganizationWithin ?middleOrg .
|
||||
?middleOrg core:subOrganizationWithin ?outerOrg .
|
||||
?outerOrg rdfs:label ?outerOrgName
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
<query-construct>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
CONSTRUCT {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:dateTimeInterval ?dateTimeInterval .
|
||||
?dateTimeInterval core:start ?dateTimeStartValue .
|
||||
?dateTimeStartValue core:dateTime ?dateTimeStart
|
||||
} WHERE {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:dateTimeInterval ?dateTimeInterval .
|
||||
?dateTimeInterval core:start ?dateTimeStartValue .
|
||||
?dateTimeStartValue core:dateTime ?dateTimeStart
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
<query-construct>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
CONSTRUCT {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:dateTimeInterval ?dateTimeInterval .
|
||||
?dateTimeInterval core:end ?dateTimeEndValue .
|
||||
?dateTimeEndValue core:dateTime ?dateTimeEnd
|
||||
} WHERE {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:dateTimeInterval ?dateTimeInterval .
|
||||
?dateTimeInterval core:end ?dateTimeEndValue .
|
||||
?dateTimeEndValue core:dateTime ?dateTimeEnd
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
<template>propStatement-personInPosition.ftl</template>
|
||||
</list-view-config>
|
||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
|
||||
|
||||
<list-view-config>
|
||||
<query-select>
|
||||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
|
||||
PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
|
||||
PREFIX obo: <http://purl.obolibrary.org/obo/>
|
||||
|
||||
SELECT DISTINCT <collated>?subclass</collated>
|
||||
?position
|
||||
?positionTitle
|
||||
?hrJobTitle
|
||||
?rank
|
||||
?org ?orgName
|
||||
?middleOrg ?middleOrgName
|
||||
?outerOrg ?outerOrgName
|
||||
?dateTimeStart ?dateTimeEnd WHERE {
|
||||
?subject ?property ?position
|
||||
OPTIONAL { ?position core:relates ?org .
|
||||
?org rdfs:label ?orgName
|
||||
OPTIONAL { ?org obo:BFO_0000050 ?middleOrg .
|
||||
?middleOrg rdfs:label ?middleOrgName
|
||||
OPTIONAL { ?middleOrg obo:BFO_0000050 ?outerOrg .
|
||||
?outerOrg rdfs:label ?outerOrgName
|
||||
}
|
||||
}
|
||||
}
|
||||
OPTIONAL { ?position rdfs:label ?positionTitle }
|
||||
OPTIONAL { ?position core:hrJobTitle ?hrJobTitle }
|
||||
OPTIONAL { ?position core:rank ?rank }
|
||||
OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
|
||||
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
|
||||
?dateTimeStartValue core:dateTime ?dateTimeStart
|
||||
}
|
||||
OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
|
||||
?dateTimeEndValue core:dateTime ?dateTimeEnd
|
||||
}
|
||||
}
|
||||
<collated>
|
||||
OPTIONAL { ?position vitro:mostSpecificType ?subclass .
|
||||
?subclass rdfs:subClassOf core:Position
|
||||
}
|
||||
</collated>
|
||||
<critical-data-required>
|
||||
FILTER ( bound(?org) )
|
||||
</critical-data-required>
|
||||
} ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) ?rank
|
||||
</query-select>
|
||||
|
||||
<query-construct>
|
||||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
|
||||
CONSTRUCT {
|
||||
?subject ?property ?position .
|
||||
?position vitro:mostSpecificType ?subclass .
|
||||
?subclass rdfs:subClassOf core:Position
|
||||
} WHERE {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position vitro:mostSpecificType ?subclass .
|
||||
?subclass rdfs:subClassOf core:Position
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
<query-construct>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
|
||||
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
|
||||
PREFIX obo: <http://purl.obolibrary.org/obo/>
|
||||
CONSTRUCT {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position ?positionProperty ?positionValue .
|
||||
?org rdfs:label ?orgName .
|
||||
?org obo:BFO_0000050 ?middleOrg .
|
||||
?middleOrg rdfs:label ?middleOrgName .
|
||||
?middleOrg obo:BFO_0000050 ?outerOrg .
|
||||
?outerOrg rdfs:label ?outerOrgName
|
||||
} WHERE {
|
||||
{
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position ?positionProperty ?positionValue
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:rank ?rank
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:relates ?org .
|
||||
?org a foaf:Organization .
|
||||
?org rdfs:label ?orgName
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:relates ?org .
|
||||
?org a foaf:Organization .
|
||||
?org obo:BFO_0000050 ?middleOrg
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:relates ?org .
|
||||
?org a foaf:Organization .
|
||||
?org obo:BFO_0000050 ?middleOrg .
|
||||
?middleOrg rdfs:label ?middleOrgName
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:relates ?org .
|
||||
?org a foaf:Organization .
|
||||
?org obo:BFO_0000050 ?middleOrg .
|
||||
?middleOrg obo:BFO_0000050 ?outerOrg
|
||||
} UNION {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:positionInOrganization ?org .
|
||||
?org a foaf:Organization .
|
||||
?org obo:BFO_0000050 ?middleOrg .
|
||||
?middleOrg obo:BFO_0000050 ?outerOrg .
|
||||
?outerOrg rdfs:label ?outerOrgName
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
<query-construct>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
CONSTRUCT {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:dateTimeInterval ?dateTimeInterval .
|
||||
?dateTimeInterval core:start ?dateTimeStartValue .
|
||||
?dateTimeStartValue core:dateTime ?dateTimeStart .
|
||||
?dateTimeInterval core:end ?dateTimeEndValue .
|
||||
?dateTimeEndValue core:dateTime ?dateTimeEnd
|
||||
} WHERE {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:dateTimeInterval ?dateTimeInterval .
|
||||
?dateTimeInterval core:start ?dateTimeStartValue .
|
||||
?dateTimeStartValue core:dateTime ?dateTimeStart .
|
||||
?dateTimeInterval core:end ?dateTimeEndValue .
|
||||
?dateTimeEndValue core:dateTime ?dateTimeEnd
|
||||
}
|
||||
</query-construct>
|
||||
<!--
|
||||
<query-construct>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
CONSTRUCT {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:dateTimeInterval ?dateTimeInterval .
|
||||
?dateTimeInterval core:end ?dateTimeEndValue .
|
||||
?dateTimeEndValue core:dateTime ?dateTimeEnd
|
||||
} WHERE {
|
||||
?subject ?property ?position .
|
||||
?position a core:Position .
|
||||
?position core:dateTimeInterval ?dateTimeInterval .
|
||||
?dateTimeInterval core:end ?dateTimeEndValue .
|
||||
?dateTimeEndValue core:dateTime ?dateTimeEnd
|
||||
}
|
||||
</query-construct>
|
||||
-->
|
||||
<template>propStatement-personInPosition.ftl</template>
|
||||
</list-view-config>
|
||||
|
|
|
@ -69,7 +69,7 @@ local:hasServiceProviderRoleContext a :ConfigContext ;
|
|||
local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
|
||||
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
|
||||
:displayName "service to the profession" ;
|
||||
vitro:displayRankAnnot 1;
|
||||
vitro:displayRankAnnot 20;
|
||||
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
|
||||
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
|
||||
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
|
||||
|
@ -129,7 +129,7 @@ local:hasTeacherRoleContext a :ConfigContext ;
|
|||
local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ;
|
||||
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
|
||||
:displayName "teaching activities" ;
|
||||
vitro:displayRankAnnot 1;
|
||||
vitro:displayRankAnnot 20;
|
||||
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
|
||||
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
|
||||
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddTeacherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
|
||||
|
@ -219,7 +219,7 @@ local:hasResearcherRoleContext a :ConfigContext ;
|
|||
local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
|
||||
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
|
||||
:displayName "research activities" ;
|
||||
vitro:displayRankAnnot 10;
|
||||
vitro:displayRankAnnot 15;
|
||||
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
|
||||
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
|
||||
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
|
||||
|
@ -234,7 +234,7 @@ local:hasInvestigatorRoleContext a :ConfigContext ;
|
|||
local:hasInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
|
||||
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
|
||||
:displayName "investigator on" ;
|
||||
vitro:displayRankAnnot 25;
|
||||
vitro:displayRankAnnot 30;
|
||||
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
|
||||
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
|
||||
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
|
||||
|
@ -249,7 +249,7 @@ local:hasPrincipalInvestigatorRoleContext a :ConfigContext ;
|
|||
local:hasPrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
|
||||
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
|
||||
:displayName "principal investigator on" ;
|
||||
vitro:displayRankAnnot 15;
|
||||
vitro:displayRankAnnot 20;
|
||||
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
|
||||
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
|
||||
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
|
||||
|
@ -264,7 +264,7 @@ local:hasCo-PrincipalInvestigatorRoleContext a :ConfigContext ;
|
|||
local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
|
||||
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
|
||||
:displayName "co-principal investigator on" ;
|
||||
vitro:displayRankAnnot 20;
|
||||
vitro:displayRankAnnot 25;
|
||||
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
|
||||
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
|
||||
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
|
||||
|
|
Loading…
Add table
Reference in a new issue