diff --git a/productMods/config/listViewConfig-hasAssociatedConcept.xml b/productMods/config/listViewConfig-hasAssociatedConcept.xml
index e5a4dfa4..9b1af0ac 100644
--- a/productMods/config/listViewConfig-hasAssociatedConcept.xml
+++ b/productMods/config/listViewConfig-hasAssociatedConcept.xml
@@ -10,14 +10,25 @@
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- SELECT ?concept ?conceptLabel ?conceptName
+ SELECT ?concept ?conceptLabel ?conceptName ?vocabularySource ?vocabularySourceName
WHERE {
?subject ?property ?concept .
LET (?conceptName := afn:localname(?concept))
optional {?concept rdfs:label ?conceptLabel}
+ optional {?concept rdfs:isDefinedBy ?vocabularySource
+ optional { ?vocabularySource rdfs:label ?vocabularySourceName}}
} ORDER BY ?conceptLabel ?conceptName
+
+ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ CONSTRUCT {
+ ?subject ?property ?concept .
+ } WHERE {
+ ?subject ?property ?concept .
+ }
+
+
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
CONSTRUCT {
@@ -25,8 +36,33 @@
?concept rdfs:label ?conceptLabel
} WHERE {
?subject ?property ?concept .
- optional {?concept rdfs:label ?conceptLabel}
+ ?concept rdfs:label ?conceptLabel
}
+
+
+ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ CONSTRUCT {
+ ?subject ?property ?concept .
+ ?concept rdfs:isDefinedBy ?vocabularySource
+ } WHERE {
+ ?subject ?property ?concept .
+ ?concept rdfs:isDefinedBy ?vocabularySource
+ }
+
+
+
+ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ CONSTRUCT {
+ ?subject ?property ?concept .
+ ?concept rdfs:isDefinedBy ?vocabularySource .
+ ?vocabularySource rdfs:label ?vocabularySourceName
+ } WHERE {
+ ?subject ?property ?concept .
+ ?concept rdfs:isDefinedBy ?vocabularySource .
+ ?vocabularySource rdfs:label ?vocabularySourceName
+ }
+
+
propStatement-hasAssociatedConcept.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
index 34aaa443..e330d897 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
@@ -6,11 +6,14 @@
is also used to generate the property statement during a deletion.
-->
-
<@showConcept statement />
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement -->
<#macro showConcept statement>
- ${statement.conceptLabel!statement.conceptName}
+ <#if statement.vocabularySourceName??>
+ ${statement.conceptLabel!statement.conceptName} (${statement.vocabularySourceName})
+ <#else>
+ ${statement.conceptLabel!statement.conceptName}
+ #if>
#macro>