diff --git a/productMods/config/listViewConfig-awardOrHonor.xml b/productMods/config/listViewConfig-awardOrHonor.xml
index 4e6cd5eb..bc8005c1 100644
--- a/productMods/config/listViewConfig-awardOrHonor.xml
+++ b/productMods/config/listViewConfig-awardOrHonor.xml
@@ -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)
-
+
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
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
}
}
@@ -73,34 +93,58 @@
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
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
+ }
+ }
-
PREFIX core: <http://vivoweb.org/ontology/core#>
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 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
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: <http://vivoweb.org/ontology/core#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
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
}
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
index 602209c8..0e28658e 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
@@ -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??>
- ${statement.awardLabel!statement.localName}
+ ${statement.awardLabel!statement.localName!}
#if>
#local>
@@ -33,5 +33,5 @@
#if>
#local>
- <@s.join [ linkedIndividual, conferredByOrg!, dateTimeVal! ] />
- #macro>
\ No newline at end of file
+ <@s.join [ linkedIndividual, conferredByOrg!, dateTimeVal! ] />
+ #macro>