From 416d42e96314cf1fe621eefb428533b2335dd66a Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 14 Jan 2011 20:58:05 +0000
Subject: [PATCH] NIHVIVO-1715 Use local name instead of label for properties
 that don't have a label (vitro props). Fixes errors in GroupedPropertyList.

---
 .../webapp/dao/jena/ObjectPropertyDaoJena.java    |  2 +-
 .../individual/GroupedPropertyList.java           | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
index 1381837ce..c5c05b547 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
@@ -896,7 +896,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             QuerySolution soln = results.next();
             Resource resource = soln.getResource("property");
             String uri = resource.getURI();
-            log.debug("Found populated object property " + uri + " for individual " + subjectUri);
+            log.debug("Found populated object property " + uri);
             ObjectProperty property = getObjectPropertyByURI(uri);
             properties.add(property);
         }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
index c9b28f451..626a6e2be 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
@@ -278,7 +278,9 @@ public class GroupedPropertyList extends BaseTemplateModel {
                          // RY How could it happen that it's already in the group? Maybe we can remove this test.
                          if (!alreadyOnPropertyList(groupForUnassignedProperties.getPropertyList(),p)) {                          
                              groupForUnassignedProperties.getPropertyList().add(p);
-                             log.debug("adding property "+p.getLabel()+" to group for unassigned properties");
+                             if (log.isDebugEnabled()) {
+                                 log.debug("adding property " + getLabel(p) + " to group for unassigned properties");
+                             }                             
                          }
                      } 
                  // Otherwise, if the property is assigned to this group, add it to the group if it's not already there
@@ -349,7 +351,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
             if (diff==0) {
                 diff = determineDisplayRank(p1) - determineDisplayRank(p2);
                 if (diff==0) {
-                    return p1.getLabel().compareTo(p2.getLabel());
+                    return getLabel(p1).compareTo(getLabel(p2));
                 } else {
                     return diff;
                 }
@@ -376,6 +378,15 @@ public class GroupedPropertyList extends BaseTemplateModel {
         }
     }
     
+    // Since we're now including some vitro properties in the property list, which don't have labels,
+    // use their local name instead.
+    private String getLabel(Property property) {
+        String label = property.getLabel();
+        if (label == null) {
+            label = property.getLocalName();
+        }
+        return label;
+    }
     
     /* Access methods for templates */