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

don't include order from type.properties if

Browse source 
where clause was set via manual subnoderelation.
This commit is contained in:
hns 2001-08-21 22:07:08 +00:00
parent 3ce3e7f54a
commit 9a4fcd1b33
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -668,20 +668,16 @@ 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 {
String q = null;
if (home.getSubnodeRelation() != null) { if (home.getSubnodeRelation() != null) {
// HACK: cut away the "where" part of manually set subnoderelation // HACK: cut off the "where" part of manually set subnoderelation
q = home.getSubnodeRelation().trim().substring(5); tds.where (home.getSubnodeRelation().trim().substring(5));
} else { } else {
// let relation object build the query // let relation object build the query
q = rel.buildQuery (home, home.getNonVirtualParent (), null, "", false); tds.where (rel.buildQuery (home, home.getNonVirtualParent (), null, "", false));
if (rel.getOrder () != null)
tds.order (rel.getOrder ());
} }
tds.where (q);
if (rel.getOrder () != null)
tds.order (rel.getOrder ());
if (logSql) if (logSql)
app.logEvent ("### getNodes: "+tds.getSelectString()); app.logEvent ("### getNodes: "+tds.getSelectString());