[Dive4elements-commits] [PATCH 1 of 2] Fixed container context variables: to upper case

Wald Commits scm-commit at wald.intevation.org
Wed Jun 26 22:31:28 CEST 2013


# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1372278237 -7200
# Node ID 201d90f56d9843dbeba83357b38092b1e51f019d
# Parent  e860fa106f5620a7be48c8079fcb26b3d52cd005
Fixed container context variables: to upper case.

- Adjusted log level
- Ignore 'properties' elements.

diff -r e860fa106f56 -r 201d90f56d98 artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java	Wed Jun 26 22:25:19 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java	Wed Jun 26 22:23:57 2013 +0200
@@ -278,7 +278,7 @@
 
             String [] columnNames = new String[properties.length];
             for (int i = 0; i < columnNames.length; ++i) {
-                columnNames[i] = properties[i][1];
+                columnNames[i] = properties[i][1].toUpperCase();
             }
 
             ResultData rd = new ResultData(columnNames);
@@ -825,12 +825,12 @@
         throws SQLException
         {
             log.debug("dc:message");
-            if (log.isInfoEnabled()) {
+            if (log.isDebugEnabled()) {
                 String value = current.getTextContent();
                 if (value.indexOf('{') >= 0) { // Performance tweak
                     value = expandXPathValue(value);
                 }
-                log.info("MESSAGE: " + value);
+                log.debug("MESSAGE: " + value);
             }
         }
 
@@ -1124,7 +1124,8 @@
                     }
                     else if ("macro".equals(localName)
                          ||  "comment".equals(localName)
-                         ||  "statement".equals(localName)) {
+                         ||  "statement".equals(localName)
+                         ||  "properties".equals(localName)) {
                         // Simply ignore them.
                     }
                     else if ("element".equals(localName)) {


More information about the Dive4elements-commits mailing list