From a3f174f813247ec75627cbdffd6f3021b901ecdc Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 15 Aug 2011 19:29:13 +0000
Subject: [PATCH] custom list view for mailingAddress. Will still display the
 label if there are no other address details

---
 .../loadedAtStartup/vivoListViewConfig.rdf    |  3 +
 .../config/listViewConfig-mailingAddress.xml  | 63 +++++++++++++++++++
 .../propStatement-mailingAddress.ftl          | 38 +++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 productMods/config/listViewConfig-mailingAddress.xml
 create mode 100644 productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl

diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf b/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
index 2f1002dc..287ead6c 100644
--- a/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
+++ b/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
@@ -35,6 +35,9 @@
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-organizationForPosition.xml</display:listViewConfigFile>
     </rdf:Description>
     
+    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#mailingAddress">
+        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-mailingAddress.xml</display:listViewConfigFile>
+    </rdf:Description>
     <!--
      ******************************************************************
      all roles use same config...is there a better way to specify this?
diff --git a/productMods/config/listViewConfig-mailingAddress.xml b/productMods/config/listViewConfig-mailingAddress.xml
new file mode 100644
index 00000000..bcd2c583
--- /dev/null
+++ b/productMods/config/listViewConfig-mailingAddress.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
+
+<list-view-config>
+    <query-select>    
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
+        PREFIX afn:  &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
+        
+        SELECT DISTINCT ?subclass 
+                        ?address
+                        ?label    
+                        ?street                    
+                        ?city 
+                        ?state
+                        ?postalCode
+                        ?country    WHERE {
+            ?subject ?property ?address 
+            OPTIONAL { ?address rdfs:label ?label  }
+            OPTIONAL { ?address core:addressStreet ?street  }
+            OPTIONAL { ?address core:addressCity ?city  }
+            OPTIONAL { ?address core:addressState ?state  }
+            OPTIONAL { ?address core:addressPostalCode ?postalCode  }
+            OPTIONAL { ?address core:addressCountry ?country  }
+            
+            
+            OPTIONAL { ?address a ?subclass .
+                       ?subclass rdfs:subClassOf core:Address 
+            } 
+            
+        } ORDER BY <collated>?subclass</collated> ?label
+    </query-select>
+       
+    <query-construct>
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;  
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;  
+        CONSTRUCT {
+            ?subclass rdfs:subClassOf core:Address 
+        } WHERE {
+            ?subclass rdfs:subClassOf core:Address 
+        }
+    </query-construct>
+    
+    <query-construct>
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
+        CONSTRUCT { 
+            ?subject ?property ?address .
+            ?address ?addressProperty ?addressValue 
+        } WHERE {
+            {
+               ?subject ?property ?address 
+            } UNION {
+               ?subject ?property ?address .
+               ?address ?addressProperty ?addressValue 
+            } 
+        } 
+    </query-construct>
+              
+    <template>propStatement-mailingAddress.ftl</template>
+</list-view-config>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
new file mode 100644
index 00000000..8fa6831c
--- /dev/null
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
@@ -0,0 +1,38 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Custom object property statement view for http://vivoweb.org/ontology/core#mailingAddress. 
+    
+     This template must be self-contained and not rely on other variables set for the individual page, because it
+     is also used to generate the property statement during a deletion.  
+ -->
+<#import "lib-sequence.ftl" as s>
+<@showAddress statement />
+
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
+     next statement -->
+     <#macro showAddress statement>
+     
+        <#-- Pre-1.4 addresses may only have an rdfs:label, so display that when  -->
+        <#-- there's no street number.                                            -->
+        <#if statement.street??>
+            <div class="adr">
+                <div class="street-address">${statement.street}</div>
+                <#-- If the subclass is core:US Postal Address, or if the country is     -->
+                <#-- the US, display the city, state, and postal code on a single line.  -->
+                <#local cityStateZip><@s.join [ statement.city!, statement.state!, statement.postalCode!], "&nbsp;" /></#local>
+                <#if ( statement.subclass?? && statement.subclass?contains("USPostalAddress") ) ||  ( statement.country?? && statement.country?contains("United States") ) >
+                    <#if cityStateZip?has_content>
+                 	    <div class="extended-address">${cityStateZip}</div>
+                 	</#if>
+                <#else>
+                    <div class="locality">${statement.city!}</div>
+                    <#if statement.state??><div class="region">${statement.state}</div></#if>
+                    <#if statement.postalCode??><div class="postal-code">${statement.postalCode}</div></#if>
+                </#if>
+                <#if statement.country??><div class="country-name">${statement.country}</div></#if>
+            </div>
+        <#else>
+            <a href="${profileUrl(statement.address)}">${statement.label!}</a>
+        </#if>
+        
+     </#macro>
\ No newline at end of file