* added check if prototype exists
* set prototype on groupby node, if specified in type.properties
This commit is contained in:
parent
e2390da037
commit
1ca8ff7363
1 changed files with 4 additions and 0 deletions
|
@ -158,6 +158,8 @@ public class Node implements INode, Serializable {
|
||||||
m = nmgr.getDbMapping (protoName);
|
m = nmgr.getDbMapping (protoName);
|
||||||
if (m == null) {
|
if (m == null) {
|
||||||
// invalid prototype name!
|
// invalid prototype name!
|
||||||
|
System.err.println ("Warning: Invalid prototype name: "+protoName+" - using default");
|
||||||
|
m = dbmap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -960,6 +962,8 @@ public class Node implements INode, Serializable {
|
||||||
if (gsrel.order != null)
|
if (gsrel.order != null)
|
||||||
snrel += " ORDER BY "+gsrel.order;
|
snrel += " ORDER BY "+gsrel.order;
|
||||||
node.setSubnodeRelation (snrel);
|
node.setSubnodeRelation (snrel);
|
||||||
|
// set prototype of groupby-node
|
||||||
|
node.setPrototype (gsrel.prototype);
|
||||||
} else {
|
} else {
|
||||||
setNode (sid, node);
|
setNode (sid, node);
|
||||||
subnodes.add (node.getID ());
|
subnodes.add (node.getID ());
|
||||||
|
|
Loading…
Add table
Reference in a new issue