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

implemented support for "prefix" and "suffix" for macros that

Browse source 
directly write out to response buffer.
This commit is contained in:
hns 2002-05-23 14:11:08 +00:00
parent 00173af1b6
commit ca2a42e204
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/helma/framework/ResponseTrans.java
View file

@ -143,6 +143,15 @@ public class ResponseTrans implements Externalizable {
return b.toString ();
}
/**
* Returns the number of characters written to the response buffer so far.
*/
public int getBufferLength() {
if (buffer == null)
return 0;
return buffer.length ();
}
/**
* Append a string to the response unchanged.
*/
@ -174,6 +183,16 @@ public class ResponseTrans implements Externalizable {
buffer.append (c, start, length);
}
/**
* Insert string somewhere in the response buffer. Caller has to make sure
* that buffer exists and its length is larger than offset. str may be null, in which
* case nothing happens.
*/
public void insert (int offset, String str) {
if (str != null)
buffer.insert (offset, str);
}
/**
* Replace special characters with entities, including <, > and ", thus allowing
* no HTML tags.

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

@ -314,6 +314,8 @@ public class Skin {
// if so, the macro evaluates to the function. Otherwise,
// a property/field with the name is used, if defined.
Object v = null;
// remember length of response buffer before calling macro
int oldLength = reval.res.getBufferLength ();
if (app.scriptingEngine.hasFunction (handlerObject, name+"_macro", reval)) {
// System.err.println ("Getting macro from function");
v = app.scriptingEngine.invoke (handlerObject, name+"_macro", arguments, null, reval);
@ -321,8 +323,17 @@ public class Skin {
// System.err.println ("Getting macro from property");
v = app.scriptingEngine.get (handlerObject, name, reval);
}
if (v != null)
// check if macro wrote out to response buffer
int newLength = reval.res.getBufferLength ();
if (newLength > oldLength) {
// insert prefix and append suffix
String prefix = (String) parameters.get ("prefix");
String suffix = (String) parameters.get ("suffix");
reval.res.insert (oldLength, prefix);
reval.res.write (suffix);
} else if (v != null) {
writeToResponse (v.toString (), reval.res);
}
} else {
String msg = "[HopMacro unhandled: "+getFullName()+"]";
reval.res.write (" "+msg+" ");