diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml
index c48255e5..9b214b58 100644
--- a/productMods/config/listViewConfig-authorInAuthorship.xml
+++ b/productMods/config/listViewConfig-authorInAuthorship.xml
@@ -9,7 +9,7 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?authorship (afn:localname(?authorship) AS ?authorshipName)
+ SELECT DISTINCT ?authorship
?infoResource ?infoResourceName
?dateTime WHERE {
?subject ?property ?authorship
@@ -28,7 +28,7 @@
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
SELECT DISTINCT ?subclass
- ?authorship (afn:localname(?authorship) AS ?authorshipName)
+ ?authorship
?infoResource ?infoResourceName
?dateTime WHERE {
?subject ?property ?authorship
diff --git a/productMods/config/listViewConfig-dateTimeInterval.xml b/productMods/config/listViewConfig-dateTimeInterval.xml
index fc04ae41..f9def01e 100644
--- a/productMods/config/listViewConfig-dateTimeInterval.xml
+++ b/productMods/config/listViewConfig-dateTimeInterval.xml
@@ -9,7 +9,7 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?dateTimeInterval ?intervalName
+ SELECT DISTINCT ?dateTimeInterval
?valueStart ?valueStartName
?dateTimeStart
?precisionStart
@@ -17,7 +17,7 @@
?dateTimeEnd
?precisionEnd WHERE {
?subject ?property ?dateTimeInterval
- LET (?intervalName := afn:localname(?dateTimeInterval))
+
OPTIONAL { ?dateTimeInterval core:start ?valueStart
LET (?valueStartName := afn:localname(?valueStart))
OPTIONAL { ?valueStart core:dateTime ?dateTimeStart }
diff --git a/productMods/config/listViewConfig-dateTimeValue.xml b/productMods/config/listViewConfig-dateTimeValue.xml
index 78407434..a26786b3 100644
--- a/productMods/config/listViewConfig-dateTimeValue.xml
+++ b/productMods/config/listViewConfig-dateTimeValue.xml
@@ -10,7 +10,6 @@
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
SELECT DISTINCT ?dateTimeValue
- (afn:localname(?dateTimeValue) AS ?dateTimeValueName)
(afn:localname(?dateTimePrecision) AS ?precision)
?dateTime WHERE {
?subject ?property ?dateTimeValue
diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml
index a9321cdc..ee68d472 100644
--- a/productMods/config/listViewConfig-educationalTraining.xml
+++ b/productMods/config/listViewConfig-educationalTraining.xml
@@ -9,14 +9,13 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?edTraining ?edTrainingName
+ SELECT DISTINCT ?edTraining
?org ?orgName
?degreeName ?degreeAbbr
?majorField ?deptOrSchool ?info
?dateTimeStart ?dateTimeEnd
WHERE {
?subject ?property ?edTraining
- LET (?edTrainingName := afn:localname(?edTraining))
OPTIONAL { ?edTraining core:trainingAtOrganization ?org .
?org rdfs:label ?orgName
}
@@ -45,14 +44,13 @@
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT DISTINCT ?subclass
- ?edTraining ?edTrainingName
+ ?edTraining
?org ?orgName
?degreeName ?degreeAbbr
?majorField ?deptOrSchool ?info
?dateTimeStart ?dateTimeEnd
WHERE {
?subject ?property ?edTraining
- LET (?edTrainingName := afn:localname(?edTraining))
OPTIONAL { ?edTraining core:trainingAtOrganization ?org .
?org rdfs:label ?orgName
OPTIONAL { ?subclass rdfs:subClassOf foaf:Organization .
diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml
index bb6dd7d1..82b60c8c 100644
--- a/productMods/config/listViewConfig-hasRole.xml
+++ b/productMods/config/listViewConfig-hasRole.xml
@@ -9,7 +9,7 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?role (afn:localname(?role) AS ?roleName)
+ SELECT DISTINCT ?role
?roleLabel
?activity ?activityName
?dateTimeStart ?dateTimeEnd WHERE {
@@ -35,7 +35,7 @@
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
SELECT DISTINCT ?subclass
- ?role (afn:localname(?role) AS ?roleName)
+ ?role
?roleLabel
?activity ?activityName
?dateTimeStart ?dateTimeEnd WHERE {
diff --git a/productMods/config/listViewConfig-informationResourceInAuthorship.xml b/productMods/config/listViewConfig-informationResourceInAuthorship.xml
index 3e2abdd4..4980c8b1 100644
--- a/productMods/config/listViewConfig-informationResourceInAuthorship.xml
+++ b/productMods/config/listViewConfig-informationResourceInAuthorship.xml
@@ -9,7 +9,7 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?authorship (afn:localname(?authorship) AS ?authorshipName)
+ SELECT DISTINCT ?authorship
?person ?personName WHERE {
?subject ?property ?authorship
OPTIONAL { ?authorship core:authorRank ?rank }
@@ -26,7 +26,7 @@
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT DISTINCT ?subclass
- ?authorship (afn:localname(?authorship) AS ?authorshipName)
+ ?authorship
?person ?personName WHERE {
?subject ?property ?authorship
OPTIONAL { ?authorship core:authorRank ?rank }
diff --git a/productMods/config/listViewConfig-organizationForPosition.xml b/productMods/config/listViewConfig-organizationForPosition.xml
index d3d63d44..c7abc188 100644
--- a/productMods/config/listViewConfig-organizationForPosition.xml
+++ b/productMods/config/listViewConfig-organizationForPosition.xml
@@ -9,7 +9,7 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?position (afn:localname(?position) AS ?positionName)
+ SELECT DISTINCT ?position
?positionTitle
?person ?personName
?dateTimeStart ?dateTimeEnd WHERE {
@@ -38,7 +38,7 @@
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
SELECT DISTINCT ?subclass
- ?position (afn:localname(?position) AS ?positionName)
+ ?position
?positionTitle
?person ?personName
?dateTimeStart ?dateTimeEnd WHERE {
diff --git a/productMods/config/listViewConfig-personInPosition.xml b/productMods/config/listViewConfig-personInPosition.xml
index bbe9d95d..6db9b722 100644
--- a/productMods/config/listViewConfig-personInPosition.xml
+++ b/productMods/config/listViewConfig-personInPosition.xml
@@ -9,7 +9,7 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?position (afn:localname(?position) AS ?positionName)
+ SELECT DISTINCT ?position
?positionTitle
?hrJobTitle
?org ?orgName
@@ -37,7 +37,7 @@
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
SELECT DISTINCT ?subclass
- ?position (afn:localname(?position) AS ?positionName)
+ ?position
?positionTitle
?hrJobTitle
?org ?orgName
diff --git a/productMods/config/listViewConfig-relatedRole.xml b/productMods/config/listViewConfig-relatedRole.xml
index 73ea19d8..a4085f00 100644
--- a/productMods/config/listViewConfig-relatedRole.xml
+++ b/productMods/config/listViewConfig-relatedRole.xml
@@ -9,7 +9,7 @@
PREFIX core: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT DISTINCT ?role (afn:localname(?role) AS ?roleName)
+ SELECT DISTINCT ?role
?roleLabel ?roleTypeLabel
?indivInRole (afn:localname(?indivInRole) AS ?indivName)
?indivLabel
@@ -48,7 +48,7 @@
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
SELECT DISTINCT ?subclass
- ?role (afn:localname(?role) AS ?roleName)
+ ?role
?roleLabel ?roleTypeLabel
?indivInRole (afn:localname(?indivInRole) AS ?indivName)
?indivLabel
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
index c965a5ab..851aea43 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
@@ -16,7 +16,7 @@
${statement.infoResourceName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
- ${statement.authorshipName} (no linked information resource)
+ missing information resource
#if>
#local>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
index c1254b6a..b0a7a410 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl
@@ -5,7 +5,7 @@
<#import "lib-datetime.ftl" as dt>
<#if ! statement.valueStart?? && ! statement.valueEnd??>
- ${statement.intervalName} (incomplete date/time interval data)
+ incomplete date/time interval
<#else>
${dt.dateTimeIntervalLong("${statement.dateTimeStart!}", "${statement.precisionStart!}", "${statement.dateTimeEnd!}", "${statement.precisionEnd!}")}
#if>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
index ad526a59..d6122d45 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl
@@ -6,7 +6,7 @@
<#-- No core:dateTime data property assigned. Display a link to the core:DateTimeValue object -->
<#if ! statement.dateTime??>
- ${statement.dateTimeValueName} (incomplete date/time data)
+ incomplete date/time
<#else>
${dt.formatXsdDateTimeLong(statement.dateTime, statement.precision!)}
#if>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
index 991a1622..1e0e4670 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
@@ -27,7 +27,7 @@
${statement.orgName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
- ${statement.edTrainingName} (no linked organization)
+ missing organization
#if>
#local>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
index d924d9e1..fb19fc5a 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
@@ -16,7 +16,7 @@
${statement.activityLabel!statement.activityName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
- ${statement.roleName} (no linked activity)
+ missing activity
#if>
#local>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
index c4001f87..1ec51f00 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
@@ -13,6 +13,6 @@
${statement.personName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
- ${statement.authorshipName} (no linked author)
+ missing author
#if>
#macro>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
index 26a9a909..b7957428 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
@@ -16,7 +16,7 @@
${statement.personName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
- ${statement.positionName} (no linked person)
+ missing person in this position
#if>
#local>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
index 2f9d6ef4..2f659aca 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
@@ -16,7 +16,7 @@
${statement.orgName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
- ${statement.positionName} (no linked organization)
+ missing organization
#if>
#local>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
index 880c366f..5d7d7793 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
@@ -16,7 +16,7 @@
${statement.indivLabel!statement.indivName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
- ${statement.roleName} (no linked individual in this role)
+ missing person in this role
#if>
#local>