antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

adapted to fixed Node.getGroupbySubnode

Browse source
This commit is contained in:
hns 2001-01-04 12:49:34 +00:00
parent 0c85da040c
commit 0910855981
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/helma/objectmodel/db/NodeManager.java
View file

@ -681,6 +681,7 @@ public final class NodeManager {
private Node getNodeByRelation (DbWrapper db, DbTxn txn, Node home, String kstr, Relation rel) throws Exception { private Node getNodeByRelation (DbWrapper db, DbTxn txn, Node home, String kstr, Relation rel) throws Exception {
Node node = null; Node node = null;
if (rel != null && rel.virtual && home.getState() != INode.VIRTUAL) { if (rel != null && rel.virtual && home.getState() != INode.VIRTUAL) {
Key k = home.getKey ().getVirtualKey (kstr); Key k = home.getKey ().getVirtualKey (kstr);
node = (Node) cache.get (k); node = (Node) cache.get (k);
@ -712,7 +713,8 @@ public final class NodeManager {
} }
} else if (rel != null && rel.groupby != null) { } else if (rel != null && rel.groupby != null) {
return home.getGroupbySubnode (kstr, rel); return home.getGroupbySubnode (kstr);
} else if (rel == null || rel.other == null || !rel.other.isRelational ()) { } else if (rel == null || rel.other == null || !rel.other.isRelational ()) {
node = db.getNode (txn, kstr); node = db.getNode (txn, kstr);
node.nmgr = safe; node.nmgr = safe;