From a7541643f411416ff7de944fd40af0e6fe9bb39a Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Mon, 9 Feb 2015 17:13:16 -0500
Subject: [PATCH] VIVO-965: list view changes so that non-faux properties will
 be collated correctly

---
 productMods/config/listViewConfig-default.xml | 21 ++++++++-----------
 .../individual/propStatement-default.ftl      |  8 +++++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/productMods/config/listViewConfig-default.xml b/productMods/config/listViewConfig-default.xml
index 1846f0ef..79e6138e 100644
--- a/productMods/config/listViewConfig-default.xml
+++ b/productMods/config/listViewConfig-default.xml
@@ -31,11 +31,10 @@
 
             OPTIONAL {
                 # Get mostSpecificType only for Persons
-                ?object a foaf:Person .
-                ?object vitro:mostSpecificType ?typeUri .
-                ?typeUri rdfs:label ?type .
+                ?object vitro:mostSpecificType ?subclass .
+                ?subclass rdfs:label ?type .
                 # Display only a mostSpecificType that belongs to a classgroup.
-                ?typeUri vitro:inClassGroup ?classGroup .
+                ?subclass vitro:inClassGroup ?classGroup .
                 ?classGroup a vitro:ClassGroup
             }
             
@@ -45,7 +44,6 @@
             }             
             
             <collated>
-            OPTIONAL { ?object a ?subclass } 
             FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )   
             </collated>
         
@@ -62,7 +60,6 @@
         CONSTRUCT {
             ?subject ?property ?object .
 			?object a ?objectType .
-            ?object a ?subclass .
             ?object rdfs:label ?label .
         } WHERE {
             { 
@@ -86,10 +83,10 @@
         CONSTRUCT {
             ?subject ?property ?object .
 			?object a ?objectType .
-            ?object vitro:mostSpecificType ?typeUri .
-            ?typeUri vitro:inClassGroup ?classGroup .
+            ?object vitro:mostSpecificType ?subclass .
+            ?subclass vitro:inClassGroup ?classGroup .
             ?classGroup a vitro:ClassGroup .
-            ?typeUri rdfs:label ?type .
+            ?subclass rdfs:label ?type .
             ?object obo:ARG_2000028 ?vcard . 
             ?vcard vcard:hasTitle ?titleObj .
             ?titleObj vcard:title ?title
@@ -100,9 +97,9 @@
             } UNION {            
                 ?subject ?property ?object .
 				?object a ?objectType .
-                ?object vitro:mostSpecificType ?typeUri .
-                ?typeUri rdfs:label ?type .
-                ?typeUri vitro:inClassGroup ?classGroup .
+                ?object vitro:mostSpecificType ?subclass .
+                ?subclass rdfs:label ?type .
+                ?subclass vitro:inClassGroup ?classGroup .
                 ?classGroup a vitro:ClassGroup
             } UNION {            
                 ?subject ?property ?object .
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl
index a32c31dc..57d72690 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl
@@ -9,8 +9,12 @@
 <@showStatement statement />
 
 <#macro showStatement statement>
-    <#-- The query retrieves a type only for Persons. Post-processing will remove all but one. -->   
-    <a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a>&nbsp; ${statement.title!statement.type!}
+    <#-- The query retrieves a type only for Persons. Post-processing will remove all but one. --> 
+  	<#if statement.subclass??>
+		<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a>
+	<#else>
+    	<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a>&nbsp; ${statement.title!statement.type!}
+	</#if>
 </#macro>