From 78f9a3f1161f365589904fadd686ffe061c0d2fb Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 13 Jan 2011 00:23:12 +0000
Subject: [PATCH] NIHVIVO-1332 Editing link for rdfs:label: fix error when the
 individual has only a local name but no label

---
 .../DataPropertyStatementTemplateModel.java   | 30 +++++++++++++------
 .../individual/IndividualTemplateModel.java   |  9 ++++--
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java
index 65eb6bb1c..dafed6c12 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java
@@ -26,29 +26,41 @@ public class DataPropertyStatementTemplateModel extends PropertyStatementTemplat
     private static final Log log = LogFactory.getLog(DataPropertyStatementTemplateModel.class); 
     private static final String EDIT_PATH = "edit/editDatapropStmtRequestDispatch.jsp";  
     
-    private Literal value;
+    private String value = null;
     
     // Used for editing
     private String dataPropHash = null;
 
     DataPropertyStatementTemplateModel(String subjectUri, String propertyUri, 
-            Literal value, EditingPolicyHelper policyHelper) {
+            Literal literal, EditingPolicyHelper policyHelper) {
         super(subjectUri, propertyUri, policyHelper);
         
-        this.value = value;
-        setEditAccess(value, policyHelper);
+        this.value = literal.getLexicalForm();
+        setEditAccess(literal, policyHelper);
 
     }
     
+    /** 
+     * This method handles the special case where we are creating a DataPropertyStatementTemplateModel outside the GroupedPropertyList.
+     * Specifically, it allows rdfs:label to be treated like a data property statement and thus have editing links. It could potentially
+     * be used for other properties outside the property list as well.
+     */
     DataPropertyStatementTemplateModel(String subjectUri, String propertyUri, VitroRequest vreq, EditingPolicyHelper policyHelper) {
         super(subjectUri, propertyUri, policyHelper);
         
         DataPropertyStatementDao dpsDao = vreq.getWebappDaoFactory().getDataPropertyStatementDao();
-        List<Literal> values = dpsDao.getDataPropertyValuesForIndividualByProperty(subjectUri, propertyUri);
-        
-        value = values.get(0);
-        setEditAccess(value, policyHelper);
+        List<Literal> literals = dpsDao.getDataPropertyValuesForIndividualByProperty(subjectUri, propertyUri);
         
+        // Make sure the subject has a value for this property 
+        if (literals.size() > 0) {
+            Literal literal = literals.get(0);
+            value = literal.getLexicalForm();
+            setEditAccess(literal, policyHelper);
+        } 
+    }
+    
+    protected void setValue(String value) {
+        this.value = value;
     }
     
     private void setEditAccess(Literal value, EditingPolicyHelper policyHelper) {
@@ -80,7 +92,7 @@ public class DataPropertyStatementTemplateModel extends PropertyStatementTemplat
     /* Access methods for templates */
     
     public String getValue() {
-        return value.getLexicalForm();
+        return value;
     }
     
     public String getEditUrl() {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
index 98f7143bb..8a577a44b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
@@ -188,8 +188,13 @@ public class IndividualTemplateModel extends BaseTemplateModel {
     }
     
     public DataPropertyStatementTemplateModel getNameStatement() {
-        String propertyUri = VitroVocabulary.LABEL;
-        return new DataPropertyStatementTemplateModel(getUri(), propertyUri, vreq, policyHelper);
+        String propertyUri = VitroVocabulary.LABEL; // rdfs:label
+        DataPropertyStatementTemplateModel dpstm = new DataPropertyStatementTemplateModel(getUri(), propertyUri, vreq, policyHelper);
+        // If the individual has no rdfs:label, return the local name. It will correctly not be editable.
+        if (dpstm.getValue() == null) {
+            dpstm.setValue(getLocalName());
+        }
+        return dpstm;
     }
     
     public String getMoniker() {