From cf2e90a9ad5c69a73148c5219a2e6156d6975e15 Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 10 Nov 2011 21:19:19 +0000
Subject: [PATCH] NIHVIVO-3303 display of external concepts and/or the defining
 vocabulary associated with a concept

---
 .../WEB-INF/filegraph/tbox/isDefinedBy.owl    | 25 +++++++++++++++++++
 .../propStatement-hasAssociatedConcept.ftl    |  4 +--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 productMods/WEB-INF/filegraph/tbox/isDefinedBy.owl

diff --git a/productMods/WEB-INF/filegraph/tbox/isDefinedBy.owl b/productMods/WEB-INF/filegraph/tbox/isDefinedBy.owl
new file mode 100644
index 00000000..df14801a
--- /dev/null
+++ b/productMods/WEB-INF/filegraph/tbox/isDefinedBy.owl
@@ -0,0 +1,25 @@
+<rdf:RDF
+    xmlns:geo="http://aims.fao.org/aos/geopolitical.owl#"
+    xmlns:skco="http://www.w3.org/2004/02/skos/core#"
+    xmlns:event="http://purl.org/NET/c4dm/event.owl#"
+    xmlns:pvs="http://vivoweb.org/ontology/provenance-support#"
+    xmlns:dcelem="http://purl.org/dc/elements/1.1/"
+    xmlns:owl2="http://www.w3.org/2006/12/owl2-xml#"
+    xmlns:scirr="http://vivoweb.org/ontology/scientific-research-resource#"
+    xmlns:vivo="http://vivoweb.org/ontology/core#"
+    xmlns:vann="http://purl.org/vocab/vann/"
+    xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
+    xmlns:skos="http://www.w3.org/2008/05/skos#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:afn="http://jena.hpl.hp.com/ARQ/function#"
+    xmlns:bibo="http://purl.org/ontology/bibo/"
+    xmlns:foaf="http://xmlns.com/foaf/0.1/"
+    xmlns:swvs="http://www.w3.org/2003/06/sw-vocab-status/ns#"
+    xmlns:owl="http://www.w3.org/2002/07/owl#"
+    xmlns:dcterms="http://purl.org/dc/terms/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
+  <rdf:Description rdf:about="http://www.w3.org/2000/01/rdf-schema#isDefinedBy">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
+  </rdf:Description>
+</rdf:RDF>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
index e330d897..b2cde02b 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl
@@ -12,8 +12,8 @@
      next statement -->
 <#macro showConcept statement>
       <#if statement.vocabularySourceName??>
-          <a href="${statement.concept}">${statement.conceptLabel!statement.conceptName}</a>  (<a href="${statement.vocabularySource}">${statement.vocabularySourceName}</a>)
+          <a href="${profileUrl(statement.concept)}">${statement.conceptLabel!statement.conceptName}</a> (${statement.vocabularySourceName})
       <#else>
-          <a href="${statement.concept}">${statement.conceptLabel!statement.conceptName}</a> 
+          <a href="${profileUrl(statement.concept)}">${statement.conceptLabel!statement.conceptName}</a> 
       </#if>
 </#macro>