diff --git a/productMods/config/listViewConfig-awardOrHonor.xml b/productMods/config/listViewConfig-awardOrHonor.xml
index bc8005c1..d118b4fd 100644
--- a/productMods/config/listViewConfig-awardOrHonor.xml
+++ b/productMods/config/listViewConfig-awardOrHonor.xml
@@ -14,6 +14,7 @@
PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
SELECT DISTINCT ?awardReceipt
+ ?receiptLabel
?award
?awardLabel
?conferredBy
@@ -24,67 +25,29 @@
WHERE {
?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 { ?awardReceipt core:dateTimeInterval ?dateTimeInterval
- OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
- ?dateTimeStartValue core:dateTime ?dateTimeStart
- }
- }
- OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval
- OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
- ?dateTimeEndValue core:dateTime ?dateTimeEnd
- }
- }
- OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue
- OPTIONAL { ?dateTimeValue core:dateTime ?dateTime
-
- }
- }
-
- } 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 ?awardReceipt .
- ?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
- ?awardReceipt rdfs:label ?awardReceiptLabel .
- ?awardReceipt core:receiptOf ?award .
- ?award core:receipt ?awardReceipt .
- ?award rdfs:label ?awardLabel
- } WHERE {
- {
- ?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 rdfs:label ?awardLabel
- }
- }
-
+ OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel }
+ OPTIONAL { ?awardReceipt core:receiptOf ?award .
+ ?award core:receipt ?awardReceipt
+ OPTIONAL { ?award rdfs:label ?awardLabel }
+ OPTIONAL { ?award core:awardConferredBy ?conferredBy
+ OPTIONAL { ?conferredBy rdfs:label ?conferredByLabel }
+ }
+ }
+ OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval
+ OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
+ ?dateTimeStartValue core:dateTime ?dateTimeStart
+ }
+ }
+ OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval
+ OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
+ ?dateTimeEndValue core:dateTime ?dateTimeEnd
+ }
+ }
+ OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue
+ OPTIONAL { ?dateTimeValue core:dateTime ?dateTime }
+ }
+ } ORDER BY DESC(?dateTime) DESC(?dateTimeEnd)
+
PREFIX bibo: <http://purl.org/ontology/bibo/>
@@ -94,41 +57,42 @@
CONSTRUCT {
?subject ?property ?awardReceipt .
- ?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
- ?awardReceipt rdfs:label ?awardReceiptLabel .
+ ?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt .
+ ?award rdfs:label ?awardLabel .
?award core:awardConferredBy ?conferredBy .
?conferredBy rdfs:label ?conferredByLabel
} WHERE {
{
?subject ?property ?awardReceipt
} UNION {
- ?subject ?property ?awardReceipt .
- ?awardReceipt ?awardReceiptProperty ?awardReceiptValue
+ ?subject ?property ?awardReceipt .
+ ?awardReceipt rdfs:label ?receiptLabel
} UNION {
?subject ?property ?awardReceipt .
- ?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
- ?awardReceipt rdfs:label ?awardReceiptLabel
- } UNION {
- ?subject ?property ?awardReceipt .
- ?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
- ?awardReceipt rdfs:label ?awardReceiptLabel .
+ ?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt
} UNION {
?subject ?property ?awardReceipt .
- ?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
- ?awardReceipt rdfs:label ?awardReceiptLabel .
+ ?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt .
+ ?award rdfs:label ?awardLabel
+ } UNION {
+ ?subject ?property ?awardReceipt .
+ ?awardReceipt rdfs:label ?receiptLabel .
+ ?awardReceipt core:receiptOf ?award .
+ ?award core:receipt ?awardReceipt .
+ ?award rdfs:label ?awardLabel .
?award core:awardConferredBy ?conferredBy
} UNION {
?subject ?property ?awardReceipt .
- ?awardReceipt ?awardReceiptProperty ?awardReceiptValue .
- ?awardReceipt rdfs:label ?awardReceiptLabel .
+ ?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:receiptOf ?award .
?award core:receipt ?awardReceipt .
+ ?award rdfs:label ?awardLabel .
?award core:awardConferredBy ?conferredBy .
?conferredBy rdfs:label ?conferredByLabel
}
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
index 0e28658e..83029604 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
@@ -15,7 +15,9 @@
<#local linkedIndividual>
<#if statement.award??>
- ${statement.awardLabel!statement.localName!}
+ ${statement.awardLabel!statement.localName}
+ <#else>
+ ${statement.receiptLabel!statement.localName}
#if>
#local>
@@ -34,4 +36,5 @@
#local>
<@s.join [ linkedIndividual, conferredByOrg!, dateTimeVal! ] />
+
#macro>