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

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

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

8
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$ -->
<#-- 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
is also used to generate the property statement during a deletion.
@ -15,7 +15,7 @@
<#local linkedIndividual>
<#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>
</#local>
@ -33,5 +33,5 @@
</#if>
</#local>
<@s.join [ linkedIndividual, conferredByOrg!, dateTimeVal! ] />
</#macro>
<@s.join [ linkedIndividual, conferredByOrg!, dateTimeVal! ] />
</#macro>