From a3909c4432572be934e103a9b05e51d6f13eeacc Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 11 Jan 2011 14:49:47 +0000
Subject: [PATCH] NIHVIVO-1380 Use existing method of IndividualTemplateModel
 to produce the linked data url

---
 .../freemarker/IndividualController.java       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
index f534b47fe..3b74620ec 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
@@ -121,8 +121,6 @@ public class IndividualController extends FreemarkerHttpServlet {
             
     		body.put("relatedSubject", getRelatedSubject(vreq));
     		
-    		body.put("headContent", getRdfLinkTag(individual));
-    		
     		IndividualTemplateModel itm = getIndividualTemplateModel(vreq, individual);
     		/* We need to expose non-getters in displaying the individual's property list, 
     		 * since it requires calls to methods with parameters.
@@ -130,7 +128,9 @@ public class IndividualController extends FreemarkerHttpServlet {
     		 * into the data model: no real data can be modified. 
     		 */
 	        body.put("individual", getNonDefaultBeansWrapper(BeansWrapper.EXPOSE_SAFE).wrap(itm));
-	       
+
+	        body.put("headContent", getRdfLinkTag(itm));
+	        
 	        body.put("localName", new IndividualLocalNameMethod());
 	        
 	        String template = getIndividualTemplate(individual);
@@ -194,11 +194,13 @@ public class IndividualController extends FreemarkerHttpServlet {
         return map;
     }
     
-    //<link rel="alternate" type="application/rdf+xml" href="http://vivo.cornell.edu/individual/n337/n337.rdf" /> 
-    private String getRdfLinkTag(Individual individual) {
-        String href = individual.getURI() + "/" + individual.getLocalName() + ".rdf";
-        String linkTag = "<link rel=\"alternate\" type=\"application/rdf+xml\" href=\"" +
-        		         href + "\" /> ";
+    private String getRdfLinkTag(IndividualTemplateModel itm) {
+        String linkTag = null;
+        String linkedDataUrl = itm.getLinkedDataUrl();
+        if (linkedDataUrl != null) {
+            linkTag = "<link rel=\"alternate\" type=\"application/rdf+xml\" href=\"" +
+                          linkedDataUrl + "\" /> ";
+        }
         return linkTag;
     }