From c06645ce88fffc8253fff1d9a8eaa730e3631d7f Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 14 Jan 2011 23:11:50 +0000
Subject: [PATCH] Modify messages displayed when a collated property doesn't
 have a valid config for collation, and downgrade from an error to a warning

---
 .../individual/CollatedObjectPropertyTemplateModel.java       | 4 ++--
 .../individual/ObjectPropertyTemplateModel.java               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
index 03b4cdd9a..60fbd3e60 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
@@ -45,8 +45,8 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
         
         String invalidConfigMessage = checkConfiguration();
         if ( ! invalidConfigMessage.isEmpty() ) {
-            throw new InvalidConfigurationException("Invalid configuration for property " + 
-                    op.getURI() + ":" + invalidConfigMessage); 
+            throw new InvalidConfigurationException("Invalid configuration for collated property " + 
+                    op.getURI() + ":" + invalidConfigMessage + ". Creating uncollated display instead."); 
         }
 
         /* Get the data */
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index aef940eee..750e93d11 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -141,7 +141,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
             try {
                 return new CollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper);
             } catch (InvalidConfigurationException e) {
-                log.error(e);
+                log.warn(e);
                 return new UncollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper);
             }
         } else {