From 69b315effe64637b827357896296ddfac59d06b9 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 5 Aug 2011 22:25:47 +0000
Subject: [PATCH] NIHVIVO-2508 Change template properties to methods so not
 pre-computed.

---
 .../body/foaf-person--exportQrCode.ftl        |  2 +-
 .../individual/individual-qrCodeGenerator.ftl | 10 +--
 .../individual-visualizationFoafPerson.ftl    |  6 +-
 .../individual-visualizationMapOfScience.ftl  |  2 +-
 .../individual-visualizationTemporalGraph.ftl |  2 +-
 .../individual/IndividualTemplateModel.java   | 80 +++++++++----------
 .../individuallist/ListedIndividual.java      |  4 +-
 7 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl b/productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl
index 565fbb66..4f79856e 100644
--- a/productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl
+++ b/productMods/templates/freemarker/body/foaf-person--exportQrCode.ftl
@@ -6,7 +6,7 @@
 
 <#assign qrCodeWidth = "150">
 
-<h2>Export QR Code <em>(<a href="${individual.doQrData().aboutQrCodesUrl}" title="More info on QR codes">What is this?</a>)</em></h2>
+<h2>Export QR Code <em>(<a href="${individual.qrData().aboutQrCodesUrl}" title="More info on QR codes">What is this?</a>)</em></h2>
 
 <#assign thumbUrl = individual.thumbUrl! "${urls.images}/placeholders/person.thumbnail.jpg" >
 <img class="qrCode" src="${thumbUrl}" width="160" />
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
index b470db70..ba5655d3 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
@@ -27,14 +27,14 @@
  -->
 <#macro renderCode display="icon" width="125">
     <#if hasValidVCard()>
-        <#assign qrCodeLinkedImage><a title="Export QR codes" href="${individual.doQrData().exportQrCodeUrl}"><@qrCodeVCard qrCodeWidth=width /></a></#assign>
+        <#assign qrCodeLinkedImage><a title="Export QR codes" href="${individual.qrData().exportQrCodeUrl}"><@qrCodeVCard qrCodeWidth=width /></a></#assign>
         
         <#if (display == "full")>
             <h5 class="qrCode">vCard QR</h5>
             ${qrCodeLinkedImage}
         <#elseif (display == "icon")>
             <li role="listitem">
-                <a id="qrIcon" title="vCard QR Code" href="${individual.doQrData().exportQrCodeUrl}"><img class="middle" src="${urls.images}/individual/qr_icon.png" alt="qr icon" /></a>
+                <a id="qrIcon" title="vCard QR Code" href="${individual.qrData().exportQrCodeUrl}"><img class="middle" src="${urls.images}/individual/qr_icon.png" alt="qr icon" /></a>
                 <span id="qrCodeImage" class="hidden">${qrCodeLinkedImage} <a class="qrCloseLink" href="#">Close</a></span>
             </li>
         <#else>
@@ -48,7 +48,7 @@
 
 <#function getQrCodeUrlForVCard qrCodeWidth>
 
-    <#local qrData = individual.doQrData() >
+    <#local qrData = individual.qrData() >
 
     <#local core = "http://vivoweb.org/ontology/core#">
     <#local foaf = "http://xmlns.com/foaf/0.1/">
@@ -93,7 +93,7 @@
 
 <#function getQrCodeUrlForLink qrCodeWidth>
 
-    <#local qrData = individual.doQrData() >
+    <#local qrData = individual.qrData() >
 
     <#local url = qrData.externalUrl! >
 
@@ -129,7 +129,7 @@
 
 <#function hasValidVCard>
 
-    <#local qrData = individual.doQrData() >
+    <#local qrData = individual.qrData() >
 
     <#local firstName = qrData.firstName! >
     <#local lastName = qrData.lastName! >
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
index 5faf712b..7f5c57c8 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
@@ -19,8 +19,8 @@
         <#if isAuthor>
             <#assign coAuthorIcon = "${urls.images}/visualization/co_author_icon.png">
             <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/vivo-scimap.png">
-            <#assign coAuthorVisUrl = individual.coAuthorVisUrl>
-            <#assign mapOfScienceVisUrl = individual.mapOfScienceUrl>
+            <#assign coAuthorVisUrl = individual.coAuthorVisUrl()>
+            <#assign mapOfScienceVisUrl = individual.mapOfScienceUrl()>
             
             <#assign googleJSAPI = "https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22imagesparkline%22%5D%7D%5D%7D"> 
             
@@ -61,7 +61,7 @@
         </#if>
         
         <#if isInvestigator>
-            <#assign coInvestigatorVisUrl = individual.coInvestigatorVisUrl>
+            <#assign coInvestigatorVisUrl = individual.coInvestigatorVisUrl()>
             <#assign coInvestigatorIcon = "${urls.images}/visualization/co_investigator_icon.png">
             
             <div id="coinvestigator_link_container" class="collaboratorship-link-container">
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl
index 3198681e..821b2b56 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl
@@ -3,5 +3,5 @@
 <#-- Map Of Science visualization -->
 
 <div id="map-of-science">
-    <h3><img src="${urls.images}/visualization/mapofscience/vivo-scimap.png" width="25px" height="25px" /><a href="${individual.mapOfScienceUrl}">Map of Science</a></h3>
+    <h3><img src="${urls.images}/visualization/mapofscience/vivo-scimap.png" width="25px" height="25px" /><a href="${individual.mapOfScienceUrl()}">Map of Science</a></h3>
 </div>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl
index 65c73052..8f2f773f 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl
@@ -3,5 +3,5 @@
 <#-- Temporal graph visualization -->
 
 <div id="temporal-graph">
-    <h3><img src="${urls.images}/visualization/temporal_vis_icon.jpg" width="25px" height="25px" /><a href="${individual.temporalGraphUrl}">Temporal Graph</a></h3>
+    <h3><img src="${urls.images}/visualization/temporal_vis_icon.jpg" width="25px" height="25px" /><a href="${individual.temporalGraphUrl()}">Temporal Graph</a></h3>
 </div>
\ No newline at end of file
diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
index 24eed500..e3707eaa 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
@@ -31,17 +31,15 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
     private static final String CORE = "http://vivoweb.org/ontology/core#";
     private static final String PERSON_CLASS = FOAF + "Person";
     private static final String ORGANIZATION_CLASS = FOAF + "Organization";
+    private static final String BASE_VISUALIZATION_URL = 
+        UrlBuilder.getUrl(Route.VISUALIZATION_SHORT.path());
     
     private Map<String, String> qrData = null;
     
     public IndividualTemplateModel(Individual individual, VitroRequest vreq) {
         super(individual, vreq);
     }
-    
-    private String getBaseVisUrl() {
-        return getUrl(Route.VISUALIZATION_SHORT.path());
-    }
- 
+
     private Map<String, String> generateQrData() {
 
         Map<String,String> qrData = new HashMap<String,String>();
@@ -81,62 +79,60 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
         return qrData;
     }
     
+    private String getVisUrl(String visPath) {
+        String visUrl;
+        boolean isUsingDefaultNameSpace = UrlBuilder.isUriInDefaultNamespace(
+                                                getUri(),
+                                                vreq);
+        
+        if (isUsingDefaultNameSpace) {          
+            visUrl = visPath + getLocalName();           
+        } else {            
+            visUrl = UrlBuilder.addParams(
+                    visPath, 
+                    new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, getUri())); 
+        }
+        
+        return visUrl;
+    }
     
-    /* Template properties */
+    /* Template methods (for efficiency, not pre-computed) */
 
-    public boolean isPerson() {
+    public boolean person() {
         return isVClass(PERSON_CLASS);
     }
     
-    public boolean isOrganization() {
+    public boolean organization() {
         return isVClass(ORGANIZATION_CLASS);        
     }
     
-    public String getCoAuthorVisUrl() {   	
-        String coauthorVisURL = getBaseVisUrl() + "/" + VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL + "/";    	
-    	return getVisUrl(coauthorVisURL);
+    public String coAuthorVisUrl() {   	
+        String url = BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL + "/";    	
+    	return getVisUrl(url);
     }
 
-    public String getCoInvestigatorVisUrl() {    	
-    	String coinvestigatorVisURL = getBaseVisUrl() + "/" + VisualizationFrameworkConstants.COINVESTIGATOR_VIS_SHORT_URL + "/";    	
-    	return getVisUrl(coinvestigatorVisURL);
+    public String coInvestigatorVisUrl() {    	
+    	String url = 
+    	    BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.COINVESTIGATOR_VIS_SHORT_URL + "/";    	
+    	return getVisUrl(url);
     }
 
-	private String getVisUrl(String coinvestigatorVisURL) {
-		boolean isUsingDefaultNameSpace = UrlBuilder.isUriInDefaultNamespace(
-												getUri(),
-												vreq);
-        
-        if (isUsingDefaultNameSpace) {        	
-        	return coinvestigatorVisURL + getLocalName();        	
-        } else {        	
-        	return UrlBuilder.addParams(
-        			coinvestigatorVisURL, 
-        			new ParamMap(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY, getUri())); 
-        }
-	}
-
-    public String getTemporalGraphUrl() {
-        if (!isOrganization()) {
-            return null;
-        }        
-        String temporalVisURL = getBaseVisUrl() + "/" + VisualizationFrameworkConstants.PUBLICATION_TEMPORAL_VIS_SHORT_URL + "/";    	
-    	return getVisUrl(temporalVisURL);
+    public String temporalGraphUrl() {  
+        String url = 
+            BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.PUBLICATION_TEMPORAL_VIS_SHORT_URL + "/";    	
+    	return getVisUrl(url);
     }
 
-    public String getMapOfScienceUrl() {
-    	String mapOfScienceVisURL = getBaseVisUrl() + "/" + VisualizationFrameworkConstants.MAP_OF_SCIENCE_VIS_SHORT_URL + "/";    	
-    	return getVisUrl(mapOfScienceVisURL);
+    public String mapOfScienceUrl() {
+    	String url = 
+    	    BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.MAP_OF_SCIENCE_VIS_SHORT_URL + "/";    	
+    	return getVisUrl(url);
     }
     
-    
-    /* Template methods */
-    
-    public Map<String, String> doQrData() {
+    public Map<String, String> qrData() {
         if(qrData == null)
             qrData = generateQrData();
         return qrData;
     }
 
-
 }
diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
index 4a16e1fd..ce9e7899 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
@@ -20,12 +20,10 @@ public class ListedIndividual extends BaseListedIndividual {
         super(individual, vreq);
     }
     
-    /* Access methods for templates */
+    /* Template properties */
     
     public String getPreferredTitle() {
         return cleanTextForDisplay( individual.getDataValue(CORE + "preferredTitle") );
     }
     
-    // Add method to get core:webpages
-    
 }