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

in-process conversion of position rendering to ISF

Browse source
This commit is contained in:
brianjlowe 2013-08-06 16:23:44 -04:00
parent f30917d357
commit afedf991f2
3 changed files with 44 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3
View file

@ -13,6 +13,19 @@
@base <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration> . @base <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration> .
# warning: don't use blank nodes; the display model doesn't currently support them.
local:personInPositionContext a :ConfigContext ;
:hasConfiguration local:personInPositionConfig ;
:configContextFor vivo:relatedBy ;
:qualifiedBy vivo:Position .
local:personInPositionConfig a :ObjectPropertyDisplayConfig ;
:displayName "positions" ;
:listViewConfigFile "listViewConfig-personInPosition.xml"^^xsd:string ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public .
local:authorInAuthorshipContext a :ConfigContext ; local:authorInAuthorshipContext a :ConfigContext ;
:hasConfiguration local:authorInAuthorshipConfig ; :hasConfiguration local:authorInAuthorshipConfig ;
:configContextFor vivo:relatedBy ; :configContextFor vivo:relatedBy ;

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

@ -20,7 +20,7 @@
?outerOrg ?outerOrgName ?outerOrg ?outerOrgName
?dateTimeStart ?dateTimeEnd WHERE { ?dateTimeStart ?dateTimeEnd WHERE {
?subject ?property ?position ?subject ?property ?position
OPTIONAL { ?position core:positionInOrganization ?org . OPTIONAL { ?position core:relates ?org .
?org rdfs:label ?orgName ?org rdfs:label ?orgName
OPTIONAL { ?org core:subOrganizationWithin ?middleOrg . OPTIONAL { ?org core:subOrganizationWithin ?middleOrg .
?middleOrg rdfs:label ?middleOrgName ?middleOrg rdfs:label ?middleOrgName
@ -61,6 +61,7 @@
?subclass rdfs:subClassOf core:Position ?subclass rdfs:subClassOf core:Position
} WHERE { } WHERE {
?subject ?property ?position . ?subject ?property ?position .
?position a core:Position .
?position vitro:mostSpecificType ?subclass . ?position vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:Position ?subclass rdfs:subClassOf core:Position
} }
@ -69,8 +70,10 @@
<query-construct> <query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
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 foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?position . ?subject ?property ?position .
?position a core:Position .
?position ?positionProperty ?positionValue . ?position ?positionProperty ?positionValue .
?org rdfs:label ?orgName . ?org rdfs:label ?orgName .
?org core:subOrganizationWithin ?middleOrg . ?org core:subOrganizationWithin ?middleOrg .
@ -79,34 +82,47 @@
?outerOrg rdfs:label ?outerOrgName ?outerOrg rdfs:label ?outerOrgName
} WHERE { } WHERE {
{ {
?subject ?property ?position ?subject ?property ?position .
?position a core:Position .
} UNION { } UNION {
?subject ?property ?position . ?subject ?property ?position .
?position a core:Position .
?position ?positionProperty ?positionValue ?position ?positionProperty ?positionValue
} UNION { } UNION {
?subject ?property ?position . ?subject ?property ?position .
?position a core:Position .
?position core:rank ?rank ?position core:rank ?rank
} UNION { } UNION {
?subject ?property ?position . ?subject ?property ?position .
?position core:positionInOrganization ?org . ?position a core:Position .
?position core:relates ?org .
?org a foaf:Organization .
?org rdfs:label ?orgName ?org rdfs:label ?orgName
} UNION { } UNION {
?subject ?property ?position . ?subject ?property ?position .
?position core:positionInOrganization ?org . ?position a core:Position .
?position core:relates ?org .
?org a foaf:Organization .
?org core:subOrganizationWithin ?middleOrg ?org core:subOrganizationWithin ?middleOrg
} UNION { } UNION {
?subject ?property ?position . ?subject ?property ?position .
?position core:positionInOrganization ?org . ?position a core:Position .
?position core:relates ?org .
?org a foaf:Organization .
?org core:subOrganizationWithin ?middleOrg . ?org core:subOrganizationWithin ?middleOrg .
?middleOrg rdfs:label ?middleOrgName ?middleOrg rdfs:label ?middleOrgName
} UNION { } UNION {
?subject ?property ?position . ?subject ?property ?position .
?position core:positionInOrganization ?org . ?position a core:Position .
?position core:relates ?org .
?org a foaf:Organization .
?org core:subOrganizationWithin ?middleOrg . ?org core:subOrganizationWithin ?middleOrg .
?middleOrg core:subOrganizationWithin ?outerOrg ?middleOrg core:subOrganizationWithin ?outerOrg
} UNION { } UNION {
?subject ?property ?position . ?subject ?property ?position .
?position a core:Position .
?position core:positionInOrganization ?org . ?position core:positionInOrganization ?org .
?org a foaf:Organization .
?org core:subOrganizationWithin ?middleOrg . ?org core:subOrganizationWithin ?middleOrg .
?middleOrg core:subOrganizationWithin ?outerOrg . ?middleOrg core:subOrganizationWithin ?outerOrg .
?outerOrg rdfs:label ?outerOrgName ?outerOrg rdfs:label ?outerOrgName
@ -118,11 +134,13 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?position . ?subject ?property ?position .
?position a core:Position .
?position core:dateTimeInterval ?dateTimeInterval . ?position core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE { } WHERE {
?subject ?property ?position . ?subject ?property ?position .
?position a core:Position .
?position core:dateTimeInterval ?dateTimeInterval . ?position core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
@ -133,11 +151,13 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?position . ?subject ?property ?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 { } WHERE {
?subject ?property ?position . ?subject ?property ?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

2
productMods/templates/freemarker/body/partials/individual/individual-positions.ftl
View file

@ -1,7 +1,7 @@
<#-- $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$ -->
<#-- List of positions for the individual --> <#-- List of positions for the individual -->
<#assign positions = propertyGroups.pullProperty("${core}personInPosition")!> <#assign positions = propertyGroups.pullProperty("${core}relatedBy", "${core}Position")!>
<#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#assign localName = positions.localName> <#assign localName = positions.localName>
<h2 id="${localName}" class="mainPropGroup">${positions.name?capitalize} <@p.addLink positions editable /> <@p.verboseDisplay positions /></h2> <h2 id="${localName}" class="mainPropGroup">${positions.name?capitalize} <@p.addLink positions editable /> <@p.verboseDisplay positions /></h2>