Author: mfortun Date: 2011-08-09 12:24:08 +0200 (Tue, 09 Aug 2011) New Revision: 1115 Url: http://nuiton.org/repositories/revision/wikitty/1115 Log: *enable eval for wikittyPubData Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java trunk/wikitty-publication/src/main/resources/struts.xml Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-09 09:28:04 UTC (rev 1114) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-09 10:24:08 UTC (rev 1115) @@ -23,6 +23,8 @@ import org.nuiton.wikitty.publication.UiCodeDecorator; import org.nuiton.wikitty.publication.WikittyPublicationConfig; import org.nuiton.wikitty.publication.WikittyPublicationConstant; +import org.nuiton.wikitty.publication.entities.WikittyPubData; +import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.publication.entities.WikittyPubTextCompiled; import org.nuiton.wikitty.publication.entities.WikittyPubTextCompiledHelper; @@ -60,8 +62,7 @@ @Override public String execute() throws Exception { - inputStream = new ByteArrayInputStream(doAction(this, - getMandatoryArguments()).toString().getBytes()); + doAction(this,getMandatoryArguments()); return SUCCESS; } @@ -81,6 +82,19 @@ Wikitty w = proxy.findByCriteria(criteria); if (w == null || !w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { + + if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)){ + + contentType = WikittyPubDataHelper.getMimeType(w); + System.out.println(contentType); + + + + inputStream = new ByteArrayInputStream(WikittyPubDataHelper + .getContent(w)); + return WikittyPubDataHelper.getContent(w); + } + context.setContentType("text/plain"); result = String.format("no data found for criteria '%s'", criteria); @@ -172,6 +186,7 @@ } } + inputStream = new ByteArrayInputStream(result.toString().getBytes()); return result; } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-09 09:28:04 UTC (rev 1114) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-09 10:24:08 UTC (rev 1115) @@ -107,7 +107,7 @@ <param name="context">{1}</param> <param name="args">{2}</param> <result type="stream"> - <param name="contentType">${mimeType}</param> + <param name="contentType">${contentType}</param> <param name="inputName">inputStream</param> </result> </action>