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

in getNodeByRelation, check for manually set subnodeRelation

Browse source 
for additional constraints.
This commit is contained in:
hns 2001-08-21 22:44:30 +00:00
parent eb0c453cc0
commit 0ea389b663
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -877,10 +877,20 @@ public final class NodeManager {
TableDataSet tds = null; TableDataSet tds = null;
try { try {
DbMapping dbm = rel.otherType; DbMapping dbm = rel.otherType;
tds = new TableDataSet (dbm.getConnection (), dbm.getSchema (), dbm.getKeyDef ()); tds = new TableDataSet (dbm.getConnection (), dbm.getSchema (), dbm.getKeyDef ());
String where = rel.buildQuery (home, home.getNonVirtualParent (), kstr, "", false);
if (home.getSubnodeRelation () != null) {
tds.where (where); // combine our key with the constraints in the manually set subnode relation
StringBuffer where = new StringBuffer ();
where.append (rel.accessor);
where.append (" = '");
where.append (escape(kstr));
where.append ("' AND ");
where.append (home.getSubnodeRelation ().trim().substring(5).trim());
tds.where (where.toString ());
} else
tds.where (rel.buildQuery (home, home.getNonVirtualParent (), kstr, "", false));
if (logSql) if (logSql)
app.logEvent ("### getNodeByRelation: "+tds.getSelectString()); app.logEvent ("### getNodeByRelation: "+tds.getSelectString());
@ -913,21 +923,21 @@ public final class NodeManager {
} }
// a utility method to escape single quotes // a utility method to escape single quotes
/* private String escape (String str) { private String escape (String str) {
if (str == null) if (str == null)
return null; return null;
if (str.indexOf ("'") < 0) if (str.indexOf ("'") < 0)
return str; return str;
int l = str.length(); int l = str.length();
StringBuffer sbuf = new StringBuffer (l + 10); StringBuffer sbuf = new StringBuffer (l + 10);
for (int i=0; i<l; i++) { for (int i=0; i<l; i++) {
char c = str.charAt (i); char c = str.charAt (i);
if (c == '\'') if (c == '\'')
sbuf.append ("\\"); sbuf.append ("\\");
sbuf.append (c); sbuf.append (c);
} }
return sbuf.toString (); return sbuf.toString ();
} */ }
public Object[] getCacheEntries () { public Object[] getCacheEntries () {