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

replaced getFilter with getSubnodeRelation in Relation

Browse source
This commit is contained in:
hns 2001-07-25 16:42:50 +00:00
parent 5e00718453
commit e2390da037
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -594,8 +594,8 @@ public final class NodeManager {
QueryDataSet qds = null; QueryDataSet qds = null;
try { try {
Relation subrel = rel; Relation subrel = rel;
if (subrel.getFilter () != null) if (subrel.getSubnodeRelation () != null)
subrel = subrel.getFilter (); subrel = subrel.getSubnodeRelation ();
if (home.getSubnodeRelation() != null) { if (home.getSubnodeRelation() != null) {
// subnode relation was explicitly set // subnode relation was explicitly set
@ -660,8 +660,8 @@ public final class NodeManager {
TableDataSet tds = new TableDataSet (dbm.getConnection (), dbm.getSchema (), dbm.getKeyDef ()); TableDataSet tds = new TableDataSet (dbm.getConnection (), dbm.getSchema (), dbm.getKeyDef ());
try { try {
Relation subrel = rel; Relation subrel = rel;
if (subrel.getFilter () != null) if (subrel.getSubnodeRelation () != null)
subrel = subrel.getFilter (); subrel = subrel.getSubnodeRelation ();
if (home.getSubnodeRelation() != null) { if (home.getSubnodeRelation() != null) {
// HACK: subnodeRelation includes a "where", but we need it without // HACK: subnodeRelation includes a "where", but we need it without
@ -724,8 +724,8 @@ public final class NodeManager {
QueryDataSet qds = null; QueryDataSet qds = null;
try { try {
Relation subrel = rel; Relation subrel = rel;
if (subrel.getFilter () != null) if (subrel.getSubnodeRelation () != null)
subrel = subrel.getFilter (); subrel = subrel.getSubnodeRelation ();
if (home.getSubnodeRelation() != null) { if (home.getSubnodeRelation() != null) {
qds = new QueryDataSet (con, "SELECT count(*) FROM "+table+" "+home.getSubnodeRelation()); qds = new QueryDataSet (con, "SELECT count(*) FROM "+table+" "+home.getSubnodeRelation());
@ -911,8 +911,8 @@ public final class NodeManager {
} else { } else {
Relation subrel = home.getDbMapping().getSubnodeRelation (); Relation subrel = home.getDbMapping().getSubnodeRelation ();
if (subrel != null) { if (subrel != null) {
if (subrel.getFilter () != null) if (subrel.getSubnodeRelation () != null)
subrel = subrel.getFilter (); subrel = subrel.getSubnodeRelation ();
if (subrel != null && subrel.direction == Relation.BACKWARD) { if (subrel != null && subrel.direction == Relation.BACKWARD) {
where.append (" and "); where.append (" and ");
where.append (subrel.getRemoteField()); where.append (subrel.getRemoteField());