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

Fixed getSkin to actually walk down prototype path

Browse source 
res.skin can now be set to other than global skins,
using "prototype.skin" syntax. This is resolved against the
request path.
This commit is contained in:
hns 2001-08-10 18:11:59 +00:00
parent 29e9f745e1
commit 80a4e366c3
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,6 +203,8 @@ public class RequestEvaluator implements Runnable {
Prototype p = app.getPrototype (root); Prototype p = app.getPrototype (root);
String errorAction = app.props.getProperty ("error", "error"); String errorAction = app.props.getProperty ("error", "error");
action = p.getActionOrTemplate (errorAction); action = p.getActionOrTemplate (errorAction);
if (action == null)
throw new RuntimeException (error);
} else if (req.path == null || "".equals (req.path.trim ())) { } else if (req.path == null || "".equals (req.path.trim ())) {
currentNode = root; currentNode = root;
@ -333,11 +335,26 @@ public class RequestEvaluator implements Runnable {
try { try {
localrtx.timer.beginEvent (requestPath+" execute"); localrtx.timer.beginEvent (requestPath+" execute");
current.doIndirectCall (evaluator, current, action.getFunctionName (), new ESValue[0]); current.doIndirectCall (evaluator, current, action.getFunctionName (), new ESValue[0]);
// check if the script set the name of a skin to render in res.skin
if (res.skin != null) { if (res.skin != null) {
Skin skin = getSkin (null, res.skin); int dot = res.skin.indexOf (".");
if (skin != null) ESValue sobj = null;
skin.render (this, null, null); String sname = res.skin;
if (dot > -1) {
String soname = res.skin.substring (0, dot);
sobj = reqPath.getProperty (soname, soname.hashCode ());
if (sobj == null || sobj == ESUndefined.theUndefined)
throw new RuntimeException ("Skin "+res.skin+" not found in path.");
sname = res.skin.substring (dot+1);
} }
Skin skin = getSkin ((ESNode) sobj, sname);
if (skin != null)
skin.render (this, (ESNode) sobj, null);
else
throw new RuntimeException ("Skin "+res.skin+" not found in path.");
}
localrtx.timer.endEvent (requestPath+" execute"); localrtx.timer.endEvent (requestPath+" execute");
} catch (RedirectException redirect) { } catch (RedirectException redirect) {
// res.redirect = redirect.getMessage (); // res.redirect = redirect.getMessage ();
@ -852,11 +869,11 @@ public class RequestEvaluator implements Runnable {
} }
public ObjectPrototype getPrototype (String protoName) { public ObjectPrototype getPrototype (String protoName) {
return (ObjectPrototype) prototypes.get (protoName); return (ObjectPrototype) prototypes.get (protoName.toLowerCase ());
} }
public void putPrototype (String protoName, ObjectPrototype op) { public void putPrototype (String protoName, ObjectPrototype op) {
prototypes.put (protoName, op); prototypes.put (protoName.toLowerCase (), op);
} }