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

fixed parsing of type.properties file

Browse source 
removed getKeyID method
This commit is contained in:
hns 2001-08-05 19:22:20 +00:00
parent 318cc163d1
commit 889ab2dfcb
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/helma/objectmodel/Relation.java
View file

@ -96,7 +96,7 @@ public class Relation {
direction = BACKWARD; direction = BACKWARD;
int lt = desc.indexOf ("<"); int lt = desc.indexOf ("<");
int dot = desc.indexOf ("."); int dot = desc.indexOf (".");
String otherType = dot < 0 ? desc.substring (1).trim () : desc.substring (1, dot).trim (); String otherType = dot < 0 ? desc.substring (lt+1).trim () : desc.substring (lt+1, dot).trim ();
other = app.getDbMapping (otherType); other = app.getDbMapping (otherType);
if (other == null) if (other == null)
throw new RuntimeException ("DbMapping for "+otherType+" not found from "+home.typename); throw new RuntimeException ("DbMapping for "+otherType+" not found from "+home.typename);
@ -205,7 +205,7 @@ public class Relation {
* Relation uses the primary key return just the key value, otherwise include info on the * Relation uses the primary key return just the key value, otherwise include info on the
* used column or even the base node to avoid collisions. * used column or even the base node to avoid collisions.
*/ */
public String getKeyID (INode home, String kval) { /* public String getKeyID (INode home, String kval) {
// if the column is not the primary key, we add the column name to the key // if the column is not the primary key, we add the column name to the key
if ((direction == DIRECT || direction == FORWARD) && !usesPrimaryKey ()) { if ((direction == DIRECT || direction == FORWARD) && !usesPrimaryKey ()) {
// check if the subnode relation also has to be considered // check if the subnode relation also has to be considered
@ -216,7 +216,7 @@ public class Relation {
} else { } else {
return kval; return kval;
} }
} } */
/** /**
* Get the local column name for this relation to use in where clauses of select statements. * Get the local column name for this relation to use in where clauses of select statements.