Author: ssanthor
Date: 2007-05-29 15:16:27 +0200 (Tue, 29 May 2007)
New Revision: 5224
Modified:
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/SlashTrimStringDirective.java
Log:
updated
Modified:
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/SlashTrimStringDirective.java
===================================================================
---
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/SlashTrimStringDirective.java
2007-05-29 11:45:49 UTC (rev 5223)
+++
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/view/velocity/SlashTrimStringDirective.java
2007-05-29 13:16:27 UTC (rev 5224)
@@ -34,8 +34,14 @@
public boolean render(InternalContextAdapter internalContextAdapter,
Writer writer,
Node node) throws IOException,
ResourceNotFoundException, ParseErrorException, MethodInvocationException {
+ String trimAfter = "/";
- if (node.jjtGetNumChildren() != 1) {
+ if (node.jjtGetNumChildren() == 2) {
+ final Object nodeTwo =
node.jjtGetChild(1).value(internalContextAdapter);
+ if(nodeTwo != null) {
+ trimAfter = nodeTwo.toString();
+ }
+ }else if (node.jjtGetNumChildren() != 1) {
rsvc.error("#" + getName() + " - Wrong number of arguments");
return false;
}
@@ -48,13 +54,13 @@
}
final String originalString = nodeValue.toString();
- final int index = originalString.lastIndexOf("/");
+ final int index = originalString.lastIndexOf(trimAfter);
if(index == -1)
{
writer.write(originalString);
}
else{
-
writer.write(originalString.substring(index+1,originalString.length()));
+
writer.write(originalString.substring(index+trimAfter.length(),originalString.length()));
}
return true;
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
