From 11ed388dea0ebed076bf156febc2a920269ca05f Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 18 Jan 2011 20:12:26 +0000
Subject: [PATCH] NIHVIVO-1780 Treat a negative display value as no display
 value. Debugging output in ObjectPropertyTemplateModel.

---
 .../individual/DataPropertyTemplateModel.java |  4 ++-
 .../ObjectPropertyTemplateModel.java          | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
index 71277ac36..19f77bcfa 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
@@ -45,7 +45,9 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
         // Determine whether a new statement can be added
         if (policyHelper != null) {
             // If the display limit has already been reached, we can't add a new statement
-            if ( dp.getDisplayLimit() > statements.size() ) {
+            int displayLimit = dp.getDisplayLimit();
+            // Display limit of -1 (default value for new property) doesn't count
+            if ( (displayLimit < 0) || (displayLimit > statements.size()) ) {
                 RequestedAction action = new AddDataPropStmt(subjectUri, propertyUri,RequestActionConstants.SOME_LITERAL, null, null);
                 if (policyHelper.isAuthorizedAction(action)) {
                     addAccess = true;
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 8147cc6c0..5adfbaa55 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
@@ -151,6 +151,12 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     
     /** Apply post-processing to query results to prepare for template */
     protected void postprocess(List<Map<String, String>> data, WebappDaoFactory wdf) {
+        
+        if (log.isDebugEnabled()) {
+            log.debug("Data before postprocessing");
+            logData(data);
+        }
+        
         String postprocessorName = config.postprocessor;
         if (postprocessorName == null) {
             //return;
@@ -165,6 +171,25 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
         } catch (Exception e) {
             log.error(e, e);
         }
+        
+        if (log.isDebugEnabled()) {
+            log.debug("Data after postprocessing");
+            logData(data);
+        }               
+    }
+    
+    private void logData(List<Map<String, String>> data) {
+        
+        if (log.isDebugEnabled()) {
+            int count = 1;
+            for (Map<String, String> map : data) {
+                log.debug("List item " + count);
+                count++;
+                for (String key : map.keySet()) {
+                   log.debug(key + ": " + map.get(key));
+               }
+            }
+        }        
     }
     
     /* Post-processing that must occur after collation, because it does reordering on collated subclass