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

update list view to correspond to new custom form

Browse source
This commit is contained in:
tworrall 2012-03-13 18:49:48 +00:00
parent 07c9c7c066
commit 95ae1cfdd9
2 changed files with 88 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

102
productMods/config/listViewConfig-awardOrHonor.xml
View file

@ -13,8 +13,8 @@
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
SELECT DISTINCT ?award SELECT DISTINCT ?awardReceipt
?localName ?award
?awardLabel ?awardLabel
?conferredBy ?conferredBy
?conferredByLabel ?conferredByLabel
@ -23,23 +23,24 @@
?dateTime ?dateTime
WHERE { WHERE {
?subject ?property ?award ?subject ?property ?awardReceipt .
LET ( ?localName := afn:localname(?award) ) ?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt
OPTIONAL { ?award rdfs:label ?awardLabel } OPTIONAL { ?award rdfs:label ?awardLabel }
OPTIONAL { ?award core:awardConferredBy ?conferredBy . OPTIONAL { ?award core:awardConferredBy ?conferredBy .
?conferredBy rdfs:label ?conferredByLabel ?conferredBy rdfs:label ?conferredByLabel
} }
OPTIONAL { ?award core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
} }
} }
OPTIONAL { ?award core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue . OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd
} }
} }
OPTIONAL { ?award core:dateTimeValue ?dateTimeValue OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue
OPTIONAL { ?dateTimeValue core:dateTime ?dateTime OPTIONAL { ?dateTimeValue core:dateTime ?dateTime
} }
@ -52,15 +53,34 @@
PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
CONSTRUCT { CONSTRUCT {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?award ?awardProperty ?awardValue . ?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
?awardReceipt rdfs:label ?awardReceiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt .
?award rdfs:label ?awardLabel ?award rdfs:label ?awardLabel
} WHERE { } WHERE {
{ {
?subject ?property ?award ?subject ?property ?awardReceipt
} UNION { } UNION {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?award ?awardProperty ?awardValue . ?awardReceipt ?awardReceiptProperty ?awardReceiptValue
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
?awardReceipt rdfs:label ?awardReceiptLabel
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
?awardReceipt rdfs:label ?awardReceiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
?awardReceipt rdfs:label ?awardReceiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt .
?award rdfs:label ?awardLabel ?award rdfs:label ?awardLabel
} }
} }
@ -73,34 +93,58 @@
PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX foaf: <http://xmlns.com/foaf/0.1/>
CONSTRUCT { CONSTRUCT {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
?awardReceipt rdfs:label ?awardReceiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt .
?award core:awardConferredBy ?conferredBy . ?award core:awardConferredBy ?conferredBy .
?conferredBy rdfs:label ?conferredByLabel ?conferredBy rdfs:label ?conferredByLabel
} WHERE { } WHERE {
{ {
?subject ?property ?award ?subject ?property ?awardReceipt
} UNION { } UNION {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?awardReceipt ?awardReceiptProperty ?awardReceiptValue
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
?awardReceipt rdfs:label ?awardReceiptLabel
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
?awardReceipt rdfs:label ?awardReceiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
?awardReceipt rdfs:label ?awardReceiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt .
?award core:awardConferredBy ?conferredBy ?award core:awardConferredBy ?conferredBy
} UNION { } UNION {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
?awardReceipt rdfs:label ?awardReceiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt .
?award core:awardConferredBy ?conferredBy . ?award core:awardConferredBy ?conferredBy .
?conferredBy rdfs:label ?conferredByLabel ?conferredBy rdfs:label ?conferredByLabel
} }
} }
</query-construct> </query-construct>
<query-construct> <query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?award core:dateTimeInterval ?dateTimeInterval . ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE { } WHERE {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?award core:dateTimeInterval ?dateTimeInterval . ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
} }
@ -109,13 +153,13 @@
<query-construct> <query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?award core:dateTimeInterval ?dateTimeInterval . ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE { } WHERE {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?award core:dateTimeInterval ?dateTimeInterval . ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd
} }
@ -125,12 +169,12 @@
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;
CONSTRUCT { CONSTRUCT {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?award core:dateTimeValue ?dateTimeValue . ?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime ?dateTimeValue core:dateTime ?dateTime
} WHERE { } WHERE {
?subject ?property ?award . ?subject ?property ?awardReceipt .
?award core:dateTimeValue ?dateTimeValue . ?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime ?dateTimeValue core:dateTime ?dateTime
} }
</query-construct> </query-construct>

4
productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
View file

@ -1,6 +1,6 @@
<#-- $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$ -->
<#-- Custom object property statement view for http://vivoweb.org/ontology/core#mailingAddress. <#-- Custom object property statement view for http://vivoweb.org/ontology/core#awardOrHonor.
This template must be self-contained and not rely on other variables set for the individual page, because it This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion. is also used to generate the property statement during a deletion.
@ -15,7 +15,7 @@
<#local linkedIndividual> <#local linkedIndividual>
<#if statement.award??> <#if statement.award??>
<a href="${profileUrl(statement.uri("award"))}" title="award name">${statement.awardLabel!statement.localName}</a> <a href="${profileUrl(statement.uri("award"))}" title="award name">${statement.awardLabel!statement.localName!}</a>
</#if> </#if>
</#local> </#local>