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

Cleaned up virtual and groupby relations. Let's see how it works ;->

Browse source
This commit is contained in:
hns 2001-01-03 15:17:24 +00:00
parent ced24237b6
commit 40c290efbc
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,6 +229,7 @@ public class Relation {
throw new RuntimeException ("getVirtualPropertyRelation called on non-virtual relation"); throw new RuntimeException ("getVirtualPropertyRelation called on non-virtual relation");
Relation vr = new Relation (other, localField, remoteField, direction, subnodesAreProperties); Relation vr = new Relation (other, localField, remoteField, direction, subnodesAreProperties);
vr.groupby = groupby; vr.groupby = groupby;
vr.filter = filter;
return vr; return vr;
} }
@ -236,10 +237,6 @@ 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 () {
if (groupby == null)
throw new RuntimeException ("getGroupbySubnodeRelation called on non-group-by relation");
if (filter != null)
return filter;
return getGroupbyPropertyRelation (); return getGroupbyPropertyRelation ();
} }
@ -249,6 +246,8 @@ 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 filter;
return new Relation (other, localField, remoteField, direction, subnodesAreProperties); return new Relation (other, localField, remoteField, direction, subnodesAreProperties);
} }