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

* Make sure macro output is converted to return value for nested macros.

Browse source
This commit is contained in:
hns 2007-04-06 19:13:45 +00:00
parent 6deb0a2a9a
commit 401d14d9eb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/helma/framework/core/Skin.java
View file

@ -322,7 +322,7 @@ public final class Skin {
private Object processParameter(Object value, RenderContext cx) private Object processParameter(Object value, RenderContext cx)
throws Exception { throws Exception {
if (value instanceof Macro) { if (value instanceof Macro) {
return ((Macro) value).invokeAsMacro(cx, null); return ((Macro) value).invokeAsMacro(cx, null, true);
} else if (value instanceof ProcessedParameter) { } else if (value instanceof ProcessedParameter) {
return ((ProcessedParameter) value).process(cx.reval); return ((ProcessedParameter) value).process(cx.reval);
} else { } else {
@ -643,7 +643,7 @@ public final class Skin {
namedParams.put(name, value); namedParams.put(name, value);
} }
private Object invokeAsMacro(RenderContext cx, StandardParams stdParams) private Object invokeAsMacro(RenderContext cx, StandardParams stdParams, boolean asObject)
throws Exception { throws Exception {
// immediately return for comment macros // immediately return for comment macros
@ -689,7 +689,7 @@ public final class Skin {
// if macro has a filter chain and didn't return anything, use output // if macro has a filter chain and didn't return anything, use output
// as filter argument. // as filter argument.
if (filterChain != null && value == null && buffer.length() > bufLength) { if (asObject && value == null && buffer.length() > bufLength) {
value = buffer.substring(bufLength); value = buffer.substring(bufLength);
buffer.setLength(bufLength); buffer.setLength(bufLength);
} }
@ -713,7 +713,7 @@ public final class Skin {
value = cx.reval.invokeDirectFunction(handler, "onUnhandledMacro", arguments); value = cx.reval.invokeDirectFunction(handler, "onUnhandledMacro", arguments);
// if macro has a filter chain and didn't return anything, use output // if macro has a filter chain and didn't return anything, use output
// as filter argument. // as filter argument.
if (filterChain != null && value == null && buffer.length() > bufLength) { if (asObject && value == null && buffer.length() > bufLength) {
value = buffer.substring(bufLength); value = buffer.substring(bufLength);
buffer.setLength(bufLength); buffer.setLength(bufLength);
} }
@ -741,7 +741,8 @@ public final class Skin {
int bufLength = buffer.length(); int bufLength = buffer.length();
try { try {
StandardParams stdParams = standardParams.render(cx); StandardParams stdParams = standardParams.render(cx);
Object value = invokeAsMacro(cx, stdParams); boolean asObject = filterChain != null;
Object value = invokeAsMacro(cx, stdParams, asObject);
// check if macro wrote out to response buffer // check if macro wrote out to response buffer
if (buffer.length() == bufLength) { if (buffer.length() == bufLength) {