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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-10-21 15:17:23 -04:00
commit d0e57e586c
2 changed files with 180 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

342
productMods/config/listViewConfig-personInPosition.xml
View file

@ -1,168 +1,174 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt --> <!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
<list-view-config> <list-view-config>
<query-select> <query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt; PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt; PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
SELECT DISTINCT <collated>?subclass</collated>
?position SELECT DISTINCT <collated>?subclass</collated>
?positionTitle ?position
?hrJobTitle ?positionTitle
?rank ?hrJobTitle
?org ?orgName ?rank
?middleOrg ?middleOrgName ?org ?orgName
?outerOrg ?outerOrgName ?middleOrg ?middleOrgName
?dateTimeStart ?dateTimeEnd WHERE { ?outerOrg ?outerOrgName
?subject ?property ?position ?dateTimeStart ?dateTimeEnd WHERE {
OPTIONAL { ?position core:relates ?org . ?subject ?property ?position
?org rdfs:label ?orgName OPTIONAL { ?position core:relates ?org .
OPTIONAL { ?org core:subOrganizationWithin ?middleOrg . ?org rdfs:label ?orgName
?middleOrg rdfs:label ?middleOrgName OPTIONAL { ?org obo:BFO_0000050 ?middleOrg .
OPTIONAL { ?middleOrg core:subOrganizationWithin ?outerOrg . ?middleOrg rdfs:label ?middleOrgName
?outerOrg rdfs:label ?outerOrgName OPTIONAL { ?middleOrg obo:BFO_0000050 ?outerOrg .
} ?outerOrg rdfs:label ?outerOrgName
} }
} }
OPTIONAL { ?position rdfs:label ?positionTitle } }
OPTIONAL { ?position core:hrJobTitle ?hrJobTitle } OPTIONAL { ?position rdfs:label ?positionTitle }
OPTIONAL { ?position core:rank ?rank } OPTIONAL { ?position core:hrJobTitle ?hrJobTitle }
OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?position core:rank ?rank }
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
?dateTimeStartValue core:dateTime ?dateTimeStart OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
} ?dateTimeStartValue core:dateTime ?dateTimeStart
OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue . }
?dateTimeEndValue core:dateTime ?dateTimeEnd OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
} ?dateTimeEndValue core:dateTime ?dateTimeEnd
} }
<collated> }
OPTIONAL { ?position vitro:mostSpecificType ?subclass . <collated>
?subclass rdfs:subClassOf core:Position OPTIONAL { ?position vitro:mostSpecificType ?subclass .
} ?subclass rdfs:subClassOf core:Position
</collated> }
<critical-data-required> </collated>
FILTER ( bound(?org) ) <critical-data-required>
</critical-data-required> FILTER ( bound(?org) )
} ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) ?rank </critical-data-required>
</query-select> } ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) ?rank
</query-select>
<query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; <query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
?subject ?property ?position . CONSTRUCT {
?position vitro:mostSpecificType ?subclass . ?subject ?property ?position .
?subclass rdfs:subClassOf core:Position ?position vitro:mostSpecificType ?subclass .
} WHERE { ?subclass rdfs:subClassOf core:Position
?subject ?property ?position . } WHERE {
?position a core:Position . ?subject ?property ?position .
?position vitro:mostSpecificType ?subclass . ?position a core:Position .
?subclass rdfs:subClassOf core:Position ?position vitro:mostSpecificType ?subclass .
} ?subclass rdfs:subClassOf core:Position
</query-construct> }
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; <query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt; PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT { PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
?subject ?property ?position . PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
?position a core:Position . CONSTRUCT {
?position ?positionProperty ?positionValue . ?subject ?property ?position .
?org rdfs:label ?orgName . ?position a core:Position .
?org core:subOrganizationWithin ?middleOrg . ?position ?positionProperty ?positionValue .
?middleOrg rdfs:label ?middleOrgName . ?org rdfs:label ?orgName .
?middleOrg core:subOrganizationWithin ?outerOrg . ?org obo:BFO_0000050 ?middleOrg .
?outerOrg rdfs:label ?outerOrgName ?middleOrg rdfs:label ?middleOrgName .
} WHERE { ?middleOrg obo:BFO_0000050 ?outerOrg .
{ ?outerOrg rdfs:label ?outerOrgName
?subject ?property ?position . } WHERE {
?position a core:Position . {
} UNION { ?subject ?property ?position .
?subject ?property ?position . ?position a core:Position .
?position a core:Position . } UNION {
?position ?positionProperty ?positionValue ?subject ?property ?position .
} UNION { ?position a core:Position .
?subject ?property ?position . ?position ?positionProperty ?positionValue
?position a core:Position . } UNION {
?position core:rank ?rank ?subject ?property ?position .
} UNION { ?position a core:Position .
?subject ?property ?position . ?position core:rank ?rank
?position a core:Position . } UNION {
?position core:relates ?org . ?subject ?property ?position .
?org a foaf:Organization . ?position a core:Position .
?org rdfs:label ?orgName ?position core:relates ?org .
} UNION { ?org a foaf:Organization .
?subject ?property ?position . ?org rdfs:label ?orgName
?position a core:Position . } UNION {
?position core:relates ?org . ?subject ?property ?position .
?org a foaf:Organization . ?position a core:Position .
?org core:subOrganizationWithin ?middleOrg ?position core:relates ?org .
} UNION { ?org a foaf:Organization .
?subject ?property ?position . ?org obo:BFO_0000050 ?middleOrg
?position a core:Position . } UNION {
?position core:relates ?org . ?subject ?property ?position .
?org a foaf:Organization . ?position a core:Position .
?org core:subOrganizationWithin ?middleOrg . ?position core:relates ?org .
?middleOrg rdfs:label ?middleOrgName ?org a foaf:Organization .
} UNION { ?org obo:BFO_0000050 ?middleOrg .
?subject ?property ?position . ?middleOrg rdfs:label ?middleOrgName
?position a core:Position . } UNION {
?position core:relates ?org . ?subject ?property ?position .
?org a foaf:Organization . ?position a core:Position .
?org core:subOrganizationWithin ?middleOrg . ?position core:relates ?org .
?middleOrg core:subOrganizationWithin ?outerOrg ?org a foaf:Organization .
} UNION { ?org obo:BFO_0000050 ?middleOrg .
?subject ?property ?position . ?middleOrg obo:BFO_0000050 ?outerOrg
?position a core:Position . } UNION {
?position core:positionInOrganization ?org . ?subject ?property ?position .
?org a foaf:Organization . ?position a core:Position .
?org core:subOrganizationWithin ?middleOrg . ?position core:positionInOrganization ?org .
?middleOrg core:subOrganizationWithin ?outerOrg . ?org a foaf:Organization .
?outerOrg rdfs:label ?outerOrgName ?org obo:BFO_0000050 ?middleOrg .
} ?middleOrg obo:BFO_0000050 ?outerOrg .
} ?outerOrg rdfs:label ?outerOrgName
</query-construct> }
}
<query-construct> </query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { <query-construct>
?subject ?property ?position . PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
?position a core:Position . CONSTRUCT {
?position core:dateTimeInterval ?dateTimeInterval . ?subject ?property ?position .
?dateTimeInterval core:start ?dateTimeStartValue . ?position a core:Position .
?dateTimeStartValue core:dateTime ?dateTimeStart ?position core:dateTimeInterval ?dateTimeInterval .
} WHERE { ?dateTimeInterval core:start ?dateTimeStartValue .
?subject ?property ?position . ?dateTimeStartValue core:dateTime ?dateTimeStart .
?position a core:Position . ?dateTimeInterval core:end ?dateTimeEndValue .
?position core:dateTimeInterval ?dateTimeInterval . ?dateTimeEndValue core:dateTime ?dateTimeEnd
?dateTimeInterval core:start ?dateTimeStartValue . } WHERE {
?dateTimeStartValue core:dateTime ?dateTimeStart ?subject ?property ?position .
} ?position a core:Position .
</query-construct> ?position core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
<query-construct> ?dateTimeStartValue core:dateTime ?dateTimeStart .
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; ?dateTimeInterval core:end ?dateTimeEndValue .
CONSTRUCT { ?dateTimeEndValue core:dateTime ?dateTimeEnd
?subject ?property ?position . }
?position a core:Position . </query-construct>
?position core:dateTimeInterval ?dateTimeInterval . <!--
?dateTimeInterval core:end ?dateTimeEndValue . <query-construct>
?dateTimeEndValue core:dateTime ?dateTimeEnd PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
} WHERE { CONSTRUCT {
?subject ?property ?position . ?subject ?property ?position .
?position a core:Position . ?position a core:Position .
?position core:dateTimeInterval ?dateTimeInterval . ?position core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd
} } WHERE {
</query-construct> ?subject ?property ?position .
?position a core:Position .
<template>propStatement-personInPosition.ftl</template> ?position core:dateTimeInterval ?dateTimeInterval .
</list-view-config> ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
</query-construct>
-->
<template>propStatement-personInPosition.ftl</template>
</list-view-config>

12
rdf/display/everytime/PropertyConfig.n3
View file

@ -69,7 +69,7 @@ local:hasServiceProviderRoleContext a :ConfigContext ;
local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ; local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "service to the profession" ; :displayName "service to the profession" ;
vitro:displayRankAnnot 1; vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot 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> ; 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 ; local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "teaching activities" ; :displayName "teaching activities" ;
vitro:displayRankAnnot 1; vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot 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> ; 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 ; local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "research activities" ; :displayName "research activities" ;
vitro:displayRankAnnot 10; vitro:displayRankAnnot 15;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot 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> ; 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 ; local:hasInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
:displayName "investigator on" ; :displayName "investigator on" ;
vitro:displayRankAnnot 25; vitro:displayRankAnnot 30;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot 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> ; 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 ; local:hasPrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
:displayName "principal investigator on" ; :displayName "principal investigator on" ;
vitro:displayRankAnnot 15; vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot 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> ; 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 ; local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
:displayName "co-principal investigator on" ; :displayName "co-principal investigator on" ;
vitro:displayRankAnnot 20; vitro:displayRankAnnot 25;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot 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> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;