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

for propertiesAreSubnodes, take over subnode constraints to

Browse source 
property relation.
This commit is contained in:
hns 2001-08-21 22:43:51 +00:00
parent 9a4fcd1b33
commit eb0c453cc0
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/DbMapping.java
View file

@ -235,10 +235,7 @@ public class DbMapping implements Updatable {
subnodesRel = new Relation (subnodeMapping, "_subnodes", this, props); subnodesRel = new Relation (subnodeMapping, "_subnodes", this, props);
else else
subnodesRel.update (subnodeMapping, props); subnodesRel.update (subnodeMapping, props);
// if (subnodesRel.isReference ())
// subnodes = subnodesRel.other;
// else
// subnodes = (DbMapping) app.getDbMapping (subnodeMapping);
} catch (Exception x) { } catch (Exception x) {
app.logEvent ("Error reading _subnodes relation for "+typename+": "+x.getMessage ()); app.logEvent ("Error reading _subnodes relation for "+typename+": "+x.getMessage ());
// subnodesRel = null; // subnodesRel = null;
@ -254,13 +251,12 @@ public class DbMapping implements Updatable {
propertiesRel = new Relation (propertiesMapping, "_properties", this, props); propertiesRel = new Relation (propertiesMapping, "_properties", this, props);
else else
propertiesRel.update (propertiesMapping, props); propertiesRel.update (propertiesMapping, props);
// if (propertiesRel.isReference ())
// properties = propertiesRel.other;
// else
// properties = (DbMapping) app.getDbMapping (propertiesMapping);
// take over groupby flag from subnodes, if properties are subnodes // take over groupby flag from subnodes, if properties are subnodes
if (propertiesRel.subnodesAreProperties && subnodesRel != null) if (propertiesRel.subnodesAreProperties && subnodesRel != null) {
propertiesRel.groupby = subnodesRel.groupby; propertiesRel.groupby = subnodesRel.groupby;
propertiesRel.constraints = subnodesRel.constraints;
}
} catch (Exception x) { } catch (Exception x) {
app.logEvent ("Error reading _properties relation for "+typename+": "+x.getMessage ()); app.logEvent ("Error reading _properties relation for "+typename+": "+x.getMessage ());
// propertiesRel = null; // propertiesRel = null;