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

fixed /user and /users URL mappings

Browse source
This commit is contained in:
hns 2001-08-21 13:36:02 +00:00
parent 1ac901538b
commit 1c66a640a0
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/helma/framework/core/RequestEvaluator.java
View file

@ -221,9 +221,6 @@ public class RequestEvaluator implements Runnable {
} else { } else {
// march down request path... // march down request path...
// is the next path element a subnode or a property of the last one?
// currently only used for users node
boolean isProperty = false;
StringTokenizer st = new StringTokenizer (req.path, "/"); StringTokenizer st = new StringTokenizer (req.path, "/");
int ntokens = st.countTokens (); int ntokens = st.countTokens ();
@ -248,7 +245,7 @@ public class RequestEvaluator implements Runnable {
// because "/user" is a shortcut to the current user session, while "/users" // because "/user" is a shortcut to the current user session, while "/users"
// is the mounting point for all users. // is the mounting point for all users.
if (i == 0 && "user".equalsIgnoreCase (pathItems[i])) { if (i == 0 && "user".equalsIgnoreCase (pathItems[i])) {
// currentElement = user.getNode (); currentElement = user.getNode ();
if (currentElement != null) { if (currentElement != null) {
current = getElementWrapper (currentElement); current = getElementWrapper (currentElement);
reqPath.putProperty (1, current); reqPath.putProperty (1, current);
@ -256,8 +253,8 @@ public class RequestEvaluator implements Runnable {
} }
} else if (i == 0 && "users".equalsIgnoreCase (pathItems[i])) { } else if (i == 0 && "users".equalsIgnoreCase (pathItems[i])) {
// currentElement = app.getUserRoot (); currentElement = app.getUserRoot ();
// isProperty = true;
if (currentElement != null) { if (currentElement != null) {
current = getElementWrapper (currentElement); current = getElementWrapper (currentElement);
reqPath.putProperty (1, current); reqPath.putProperty (1, current);
@ -276,16 +273,6 @@ public class RequestEvaluator implements Runnable {
continue; continue;
currentElement = currentElement.getChildElement (pathItems[i]); currentElement = currentElement.getChildElement (pathItems[i]);
/* if (isProperty) // get next element as property
currentElement = currentElement.getNode (pathItems[i], false);
else {
// try to get next element as subnode first, then fall back to property
INode nextNode = currentElement.getSubnode (pathItems[i]);
if (nextNode == null)
nextNode = currentElement.getNode (pathItems[i], false);
currentElement = nextNode;
}
isProperty = false; */
// add object to request path if suitable // add object to request path if suitable
if (currentElement != null) { if (currentElement != null) {