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

Only do anonymous/named check in getElementName() for relational objects.

Browse source 
Also check if child is relational before doing Relation.checkConstraints in isParentOf().
This commit is contained in:
hns 2004-03-02 15:03:05 +00:00
parent 08c443ce6a
commit 83d29f6a60
1 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/helma/objectmodel/db/Node.java
View file

@ -413,46 +413,43 @@ public final class Node implements INode, Serializable {
* and a property value for named properties. * and a property value for named properties.
*/ */
public String getElementName() { public String getElementName() {
// if subnodes are also mounted as properties, try to get the "nice" prop value // for relational nodes we need to consult parent mapping to find element name
// instead of the id by turning the anonymous flag off. if (isRelational()) {
long lastmod = lastmodified; long lastmod = Math.max(lastmodified, dbmap.getLastTypeChange());
if ((parentHandle != null) && (lastNameCheck < lastmod)) {
try {
Node p = parentHandle.getNode(nmgr);
DbMapping parentmap = p.getDbMapping();
Relation prel = parentmap.getSubnodeRelation();
if (dbmap != null) { if (prel != null) {
lastmod = Math.max(lastmod, dbmap.getLastTypeChange()); if (prel.groupby != null) {
} setName(getString("groupname"));
if ((parentHandle != null) && (lastNameCheck < lastmod)) {
try {
Node p = parentHandle.getNode(nmgr);
DbMapping parentmap = p.getDbMapping();
Relation prel = parentmap.getSubnodeRelation();
if (prel != null) {
if (prel.groupby != null) {
setName(getString("groupname"));
anonymous = false;
} else if (prel.accessName != null) {
String propname = dbmap.columnNameToProperty(prel.accessName);
String propvalue = getString(propname);
if ((propvalue != null) && (propvalue.length() > 0)) {
setName(propvalue);
anonymous = false; anonymous = false;
} else if (!anonymous && p.isParentOf(this)) { } else if (prel.accessName != null) {
String propname = dbmap.columnNameToProperty(prel.accessName);
String propvalue = getString(propname);
if ((propvalue != null) && (propvalue.length() > 0)) {
setName(propvalue);
anonymous = false;
} else if (!anonymous && p.isParentOf(this)) {
anonymous = true;
}
} else {
anonymous = true; anonymous = true;
} }
} else { } else if (!anonymous && p.isParentOf(this)) {
anonymous = true; anonymous = true;
} }
} else if (!anonymous && p.isParentOf(this)) { } catch (Exception ignore) {
anonymous = true; // FIXME: add proper NullPointer checks in try statement
// just fall back to default method
} }
} catch (Exception ignore) {
// FIXME: add proper NullPointer checks in try statement
// just fall back to default method
}
lastNameCheck = System.currentTimeMillis(); lastNameCheck = System.currentTimeMillis();
}
} }
return (anonymous || (name == null) || (name.length() == 0)) ? id : name; return (anonymous || (name == null) || (name.length() == 0)) ? id : name;
@ -1354,7 +1351,7 @@ public final class Node implements INode, Serializable {
* @return true if the given node is contained in this node's child list * @return true if the given node is contained in this node's child list
*/ */
public boolean isParentOf(Node n) { public boolean isParentOf(Node n) {
if (dbmap != null) { if (dbmap != null && n.isRelational()) {
Relation subrel = dbmap.getSubnodeRelation(); Relation subrel = dbmap.getSubnodeRelation();
// if we're dealing with relational child nodes use // if we're dealing with relational child nodes use
// Relation.checkConstraints to avoid loading the child index. // Relation.checkConstraints to avoid loading the child index.