Author: mfortun Date: 2011-07-28 15:27:31 +0200 (Thu, 28 Jul 2011) New Revision: 1098 Url: http://nuiton.org/repositories/revision/wikitty/1098 Log: * integrate UiCodeDecorator inside externalize Mechanism Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-28 13:15:33 UTC (rev 1097) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-28 13:27:31 UTC (rev 1098) @@ -6,6 +6,8 @@ import java.util.Set; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.FileUtil; @@ -16,6 +18,7 @@ import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelHelper; import org.nuiton.wikitty.publication.PropertiesExtended; +import org.nuiton.wikitty.publication.UiCodeDecorator; import org.nuiton.wikitty.publication.WikittyFileUtil; import org.nuiton.wikitty.publication.WikittyPublicationConstant; import org.nuiton.wikitty.publication.entities.WikittyPubData; @@ -38,6 +41,7 @@ */ public class WikittyPublicationExternalize { + static private Log log = LogFactory.getLog(WikittyPublicationExternalize.class); static public String TEMPORARY_FILE_NAME = "tempBeforeJar"; static public String DEFAULT_JAR_NAME = "pub-externalized"; @@ -71,7 +75,8 @@ String Label = currentFile.getName(); // String urlFileSystem = "file:///home/User/testWP#wp"; - String urlFileSystem = currentFile.getParent() + WikittyPublicationSynchronize.LABEL_DELIM + Label; + String urlFileSystem = currentFile.getParent() + + WikittyPublicationSynchronize.LABEL_DELIM + Label; appconfig.setOption(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), urlFileSystem); @@ -101,7 +106,8 @@ PropertiesExtended metaProperties = new PropertiesExtended( filePropertiesMeta); - metaProperties.setProperty(PATH_SEPARATOR_PROPERTIE_KEY, File.separator); + metaProperties + .setProperty(PATH_SEPARATOR_PROPERTIE_KEY, File.separator); // iterate wikitty // - write file // - write property @@ -161,7 +167,7 @@ File javaFile = new File(tempDirectory.getAbsolutePath() + File.separator + labelPath + name + SOURCE_EXTENSION); javaFile.createNewFile(); - String codeClass = getCode(currentPubText); + String codeClass = getCode(wikit); FileUtil.writeString(javaFile, codeClass); File classDirectory = new File(tempDirectory.getAbsolutePath() @@ -232,10 +238,19 @@ * en jar et on va supprimer le dossier tempJar */ - public static String getCode(WikittyPubText wikitty) { - String content = wikitty.getContent(); - String mimeType = wikitty.getMimeType(); - String className = wikitty.getName();// +"PublicationClass"; + public static String getCode(Wikitty wikitty) { + UiCodeDecorator uidecDecorator = new UiCodeDecorator(); + if (uidecDecorator.isTransformationNeeded(wikitty)) { + try { + wikitty= uidecDecorator.transformPubUIToPubText(wikitty); + } catch (IOException e) { + log.debug("Error while transform ui"); + } + } + + String content = WikittyPubTextHelper.getContent(wikitty); + String mimeType = WikittyPubTextHelper.getMimeType(wikitty); + String className = WikittyPubTextHelper.getName(wikitty);// +"PublicationClass"; String classContent = StringUtils.EMPTY; // Set<String> labels = (Set<String>) @@ -266,7 +281,7 @@ classContent += "String mimeType = \"" + StringEscapeUtils.escapeJava(mimeType) + "\";"; classContent += "String criteriaName= \"" + Element.ELT_ID + ":" - + wikitty.getWikittyId() + "\";"; + + wikitty.getId() + "\";"; classContent += " result = ScriptEvaluator.eval(null, criteriaName, content, mimeType, bindings);"; classContent += "return result;"; } else { @@ -280,10 +295,12 @@ */ // contruct variables that can be used inside the java code. classContent = "PublicationContext " - + WikittyPublicationConstant.CONTEXT_VAR + " = bindings.get(\"" + + WikittyPublicationConstant.CONTEXT_VAR + + " = bindings.get(\"" + WikittyPublicationConstant.CONTEXT_VAR + "\");"; classContent = "WikittyPublicationConstant " - + WikittyPublicationConstant.EVAL_VAR + " = bindings.get(\"" + + WikittyPublicationConstant.EVAL_VAR + + " = bindings.get(\"" + WikittyPublicationConstant.EVAL_VAR + "\");"; classContent = "String " + WikittyPublicationConstant.PAGE_NAME_VAR + " = bindings.get(\"" @@ -293,8 +310,8 @@ + " = bindings.get(\"" + WikittyPublicationConstant.SUBCONTEXT_VAR + "\");"; classContent = "Wikitty " + WikittyPublicationConstant.WIKITTY_VAR - + " = bindings.get(\"" + WikittyPublicationConstant.WIKITTY_VAR - + "\");"; + + " = bindings.get(\"" + + WikittyPublicationConstant.WIKITTY_VAR + "\");"; classContent += content;