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

minor rearrangement

Browse source
This commit is contained in:
hns 2001-01-03 19:32:03 +00:00
parent 15127efd4d
commit 18478e9bf6
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/helma/objectmodel/Relation.java
View file

@ -218,7 +218,10 @@ public class Relation {
throw new RuntimeException ("getVirtualSubnodeRelation called on non-virtual relation"); throw new RuntimeException ("getVirtualSubnodeRelation called on non-virtual relation");
if (filter != null) if (filter != null)
return filter; return filter;
return getVirtualPropertyRelation (); Relation vr = new Relation (other, localField, remoteField, direction, subnodesAreProperties);
vr.groupby = groupby;
vr.filter = filter;
return vr;
} }
/** /**
@ -237,7 +240,11 @@ public class Relation {
* Return a Relation that defines the subnodes of a group-by node. * Return a Relation that defines the subnodes of a group-by node.
*/ */
public Relation getGroupbySubnodeRelation () { public Relation getGroupbySubnodeRelation () {
return getGroupbyPropertyRelation (); if (groupby == null)
throw new RuntimeException ("getGroupbyPropertyRelation called on non-group-by relation");
if (filter != null)
return filter;
return new Relation (other, localField, remoteField, direction, true);
} }
/** /**
@ -246,9 +253,7 @@ public class Relation {
public Relation getGroupbyPropertyRelation () { public Relation getGroupbyPropertyRelation () {
if (groupby == null) if (groupby == null)
throw new RuntimeException ("getGroupbyPropertyRelation called on non-group-by relation"); throw new RuntimeException ("getGroupbyPropertyRelation called on non-group-by relation");
if (filter != null) return new Relation (other, localField, remoteField, direction, true);
return filter;
return new Relation (other, localField, remoteField, direction, subnodesAreProperties);
} }