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

getNodeValue() includes the dbmapping for prototyped

Browse source 
virtual nodes ([mountpoint])
This commit is contained in:
hns 2001-01-31 19:18:41 +00:00
parent 448d2ec2d5
commit 2972ed4ad5
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/helma/objectmodel/db/Property.java
View file

@ -360,6 +360,7 @@ public final class Property implements IProperty, Serializable, Cloneable {
} }
public INode getNodeValue () { public INode getNodeValue () {
if (type == NODE && nvalueID != null) { if (type == NODE && nvalueID != null) {
Relation rel = null; Relation rel = null;
if (dbm == null && node.dbmap != null) { if (dbm == null && node.dbmap != null) {
@ -373,16 +374,19 @@ public final class Property implements IProperty, Serializable, Cloneable {
else if (!rel.virtual && rel.direction == Relation.FORWARD) else if (!rel.virtual && rel.direction == Relation.FORWARD)
return node.nmgr.getNode (node, nvalueID, rel); return node.nmgr.getNode (node, nvalueID, rel);
// avoid setting dbm for virtual relation // avoid setting dbm for virtual relation
else if (!rel.virtual /* || node.getState() == INode.VIRTUAL*/ && rel.groupby == null) else if ((!rel.virtual || rel.prototype != null) && rel.groupby == null)
dbm = rel.other; dbm = rel.other;
} }
} }
// we have what we need, now get the node from the node manager
Node retval = node.nmgr.getNode (nvalueID, dbm); Node retval = node.nmgr.getNode (nvalueID, dbm);
if (retval != null && retval.parentID == null) { if (retval != null && retval.parentID == null) {
retval.setParent (node); retval.setParent (node);
retval.setName (propname); retval.setName (propname);
retval.anonymous = false; retval.anonymous = false;
} }
if (retval != null && retval.getDbMapping () == null && rel != null && rel.virtual && rel.prototype == null) { if (retval != null && retval.getDbMapping () == null && rel != null && rel.virtual && rel.prototype == null) {
// a virtual node whose child nodes are not relational - // a virtual node whose child nodes are not relational -
// set up dbmapping that describes subnodes and properties // set up dbmapping that describes subnodes and properties
@ -393,6 +397,7 @@ public final class Property implements IProperty, Serializable, Cloneable {
_dbm.setPropertyRelation (rel.getVirtualPropertyRelation()); _dbm.setPropertyRelation (rel.getVirtualPropertyRelation());
retval.setDbMapping (_dbm); retval.setDbMapping (_dbm);
} }
return retval; return retval;
} }
return null; return null;