dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/Builder.java comparison

DC: fixed dc:group

author	Sascha L. Teichmann <teichmann@intevation.de>
date	Tue, 21 May 2013 16:30:14 +0200
parents	af13ceeba52a
children	c7777feea223

comparison

equal deleted inserted replaced

-:2f50591aacc7
+:06450ef553cc
 protected Map<Object, ResultData> createGroupedResultData(
 ResultData rd,
 String     expr,
 String     type
 ) {
 List<Object []> rows = rd.getRows();
 String [] columns = rd.getColumnLabels();
 XPathExpression x;
 try {
 ResultData orig = connectionsStack.peek().getB();
 Map<Object, ResultData> groups =
 createGroupedResultData(orig, expr, type);
-String [] columns = orig.getColumnLabels();
+boolean debug = log.isDebugEnabled();
 try {
 for (Map.Entry<Object, ResultData> entry: groups.entrySet()) {
-ResultData rd = entry.getValue();
+Object     key = entry.getKey();
+ResultData rd  = entry.getValue();
 pair.setB(rd);
-groupExprStack.push(entry.getKey());
+groupExprStack.push(key);
+if (debug) {
+log.debug("group key: " + key);
+}
 try {
-for (Object [] row: rd.getRows()) {
+for (int i = 0; i < S; ++i) {
-frames.enter();
+build(parent, subs.item(i));
-try {
-frames.put(columns, row);
-for (int i = 0; i < S; ++i) {
-build(parent, subs.item(i));
-}
-}
-finally {
-frames.leave();
-}
 }
 }
 finally {
 groupExprStack.pop();
 }
 log.warn("'var' not set.");
 return;
 }
 Object [] result = new Object[1];
-log.debug("Foo");
 if (frames.getStore(container, result)) {
 Object c = result[0];
 if (c instanceof Object []) {
 c = Arrays.asList((Object [])c);

Mercurial > dive4elements > river