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

* renamed filter to subnoderelation to free filter for future use

Browse source 
* added groupby.prototype
* possibly cleaned up a bug where relation properties were not properly inherited
when an explicit subnoderelation was specified on a virtual node in the type properties.
This commit is contained in:
hns 2001-07-25 16:45:13 +00:00
parent 1ca8ff7363
commit 8ab24c2d41
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,8 +35,10 @@ public class Relation {
public String groupbyorder; public String groupbyorder;
public String groupby; public String groupby;
public String prototype; public String prototype;
public String groupbyprototype;
public String filter;
Relation filter = null; // additional relation used to filter subnodes Relation subnoderelation = null; // additional relation used to filter subnodes
/** /**
* This constructor is used to directly construct a Relation, as opposed to reading it from a proerty file * This constructor is used to directly construct a Relation, as opposed to reading it from a proerty file
@ -144,6 +146,10 @@ public class Relation {
order = props.getProperty (propname+".order"); order = props.getProperty (propname+".order");
if (order != null && order.trim().length() == 0) if (order != null && order.trim().length() == 0)
order = null; order = null;
// get additional filter property
filter = props.getProperty (propname+".filter");
if (filter != null && filter.trim().length() == 0)
filter = null;
// get group by property // get group by property
groupby = props.getProperty (propname+".groupby"); groupby = props.getProperty (propname+".groupby");
if (groupby != null && groupby.trim().length() == 0) if (groupby != null && groupby.trim().length() == 0)
@ -152,6 +158,9 @@ public class Relation {
groupbyorder = props.getProperty (propname+".groupby.order"); groupbyorder = props.getProperty (propname+".groupby.order");
if (groupbyorder != null && groupbyorder.trim().length() == 0) if (groupbyorder != null && groupbyorder.trim().length() == 0)
groupbyorder = null; groupbyorder = null;
groupbyprototype = props.getProperty (propname+".groupby.prototype");
if (groupbyprototype != null && groupbyprototype.trim().length() == 0)
groupbyprototype = null;
} }
// check if subnode condition should be applied for property relations // check if subnode condition should be applied for property relations
if ("_properties".equalsIgnoreCase (propname) || virtual) { if ("_properties".equalsIgnoreCase (propname) || virtual) {
@ -160,9 +169,9 @@ public class Relation {
if (virtual) { if (virtual) {
String subnodefilter = props.getProperty (propname+".subnoderelation"); String subnodefilter = props.getProperty (propname+".subnoderelation");
if (subnodefilter != null) { if (subnodefilter != null) {
filter = new Relation (subnodefilter, propname+".subnoderelation", home, props); subnoderelation = new Relation (subnodefilter, propname+".subnoderelation", home, props);
filter.groupby = groupby; subnoderelation.groupby = groupby;
filter.order = order; subnoderelation.order = order;
} }
} }
} }
@ -181,8 +190,8 @@ public class Relation {
return remoteField.equalsIgnoreCase (other.getIDField()); return remoteField.equalsIgnoreCase (other.getIDField());
} }
public Relation getFilter () { public Relation getSubnodeRelation () {
return filter; return subnoderelation;
} }
/** /**
@ -239,13 +248,16 @@ public class Relation {
public Relation getVirtualSubnodeRelation () { public Relation getVirtualSubnodeRelation () {
if (!virtual) if (!virtual)
throw new RuntimeException ("getVirtualSubnodeRelation called on non-virtual relation"); throw new RuntimeException ("getVirtualSubnodeRelation called on non-virtual relation");
if (filter != null) Relation vr = null;
return filter; if (subnoderelation != null)
Relation vr = new Relation (other, localField, remoteField, direction, subnodesAreProperties); vr = subnoderelation;
else
vr = new Relation (other, localField, remoteField, direction, subnodesAreProperties);
vr.groupby = groupby; vr.groupby = groupby;
vr.groupbyorder = groupbyorder; vr.groupbyorder = groupbyorder;
vr.groupbyprototype = groupbyprototype;
vr.order = order; vr.order = order;
vr.filter = filter; vr.subnoderelation = subnoderelation;
return vr; return vr;
} }
@ -258,8 +270,9 @@ public class 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.groupbyorder = groupbyorder; vr.groupbyorder = groupbyorder;
vr.groupbyprototype = groupbyprototype;
vr.order = order; vr.order = order;
vr.filter = filter; vr.subnoderelation = subnoderelation;
return vr; return vr;
} }
@ -269,10 +282,13 @@ public class Relation {
public Relation getGroupbySubnodeRelation () { public Relation getGroupbySubnodeRelation () {
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) Relation vr = null;
return filter; if (subnoderelation != null)
Relation vr = new Relation (other, localField, remoteField, direction, subnodesAreProperties); vr = subnoderelation;
else
vr = new Relation (other, localField, remoteField, direction, subnodesAreProperties);
vr.order = order; vr.order = order;
vr.prototype = groupbyprototype;
return vr; return vr;
} }
@ -284,6 +300,7 @@ public class Relation {
throw new RuntimeException ("getGroupbyPropertyRelation called on non-group-by relation"); throw new RuntimeException ("getGroupbyPropertyRelation called on non-group-by relation");
Relation vr = new Relation (other, localField, remoteField, direction, subnodesAreProperties); Relation vr = new Relation (other, localField, remoteField, direction, subnodesAreProperties);
vr.order = order; vr.order = order;
vr.prototype = groupbyprototype;
return vr; return vr;
} }