[Wikitty-commits] r1096 - in trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication: . action

28 Jul 2011

Author: mfortun
Date: 2011-07-28 11:39:11 +0200 (Thu, 28 Jul 2011)
New Revision: 1096

Url: http://nuiton.org/repositories/revision/wikitty/1096

Log:
* integrate UiCodeDecorator to eval mechanism

Modified:
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java

Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java
===================================================================

--- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java	2011-07-28 08:16:27 UTC (rev 1095)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java	2011-07-28 09:39:11 UTC (rev 1096)
@@ -1,19 +1,18 @@
 package org.nuiton.wikitty.publication;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.commons.lang.StringUtils;
 import org.nuiton.processor.Processor;
-import org.nuiton.processor.ProcessorUtil;
 import org.nuiton.processor.filters.GeneratorTemplatesFilter;
 import org.nuiton.processor.filters.GeneratorTemplatesFilterIn;
 import org.nuiton.util.StringUtil;
+import org.nuiton.wikitty.entities.Wikitty;
 import org.nuiton.wikitty.publication.entities.WikittyPubText;
+import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper;
 
 public class UiCodeDecorator {
 
@@ -51,15 +50,15 @@
         filtersOptions= new HashMap<String, FilterOption>();
     }
 
-    public WikittyPubText transformPubUIToPubText(WikittyPubText wikitty) throws IOException {
+    public Wikitty transformPubUIToPubText(Wikitty wikitty) throws IOException  {
 
      
         
         GeneratorTemplatesFilter filter = new GeneratorTemplatesFilter();
         GeneratorTemplatesFilterIn filterIn = new GeneratorTemplatesFilterIn(filter);
 
-        String mime = wikitty.getMimeType();
-        String initialVersion = wikitty.getWikittyVersion();
+        String mime = WikittyPubTextHelper.getMimeType(wikitty);
+        String initialVersion = wikitty.getVersion();
 
         /*
          * changement de mime type changement de
@@ -81,9 +80,9 @@
         filterIn.setEndCar(foption.getEndingCar());
         filterIn.setOpeningWriterChar(foption.getOpeningWriterChar());
         filterIn.setClosingWriterChar(foption.getClosingWriterChar());
+        //filter.setPassEmptyLine(false);
         
         
-        
 
         decoringEnd = foption.getStringDelim() + foption.getEndingCar();
         decoringAffect = foption.getInitializeOutputWriter();
@@ -101,11 +100,13 @@
 
         
         StringWriter writer = new StringWriter();
+        String content = WikittyPubTextHelper.getContent(wikitty);
+        StringReader reader = new StringReader(content);
         // process string
-        proc.process(new StringReader(wikitty.getContent()), writer);
+        proc.process(reader, writer);
+   
         
         
-        
         decoredContent += decoringAffect;
         // replace element between <% %> and <%= %>
         decoredContent += writer.toString();
@@ -113,14 +114,14 @@
         // end of string
         decoredContent += decoringEnd;
 
-        wikitty.setContent(decoredContent);
-        wikitty.setMimeType(mime);
-        wikitty.setWikittyVersion(initialVersion);
+        WikittyPubTextHelper.setContent(wikitty,decoredContent);
+        WikittyPubTextHelper.setMimeType(wikitty,mime);
+        wikitty.setVersion(initialVersion);
 
         return wikitty;
     }
     
-    public boolean isTransformationNeeded(WikittyPubText wikitty){
+    public boolean isTransformationNeeded(Wikitty wikitty){
         return true;
     }
     

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-07-28 08:16:27 UTC (rev 1095)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java	2011-07-28 09:39:11 UTC (rev 1096)
@@ -1,6 +1,7 @@
 package org.nuiton.wikitty.publication.action;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18,7 +19,9 @@
 import org.nuiton.wikitty.ScriptEvaluator;
 import org.nuiton.wikitty.WikittyProxy;
 import org.nuiton.wikitty.WikittyService;
+import org.nuiton.wikitty.WikittyUtil;
 import org.nuiton.wikitty.entities.Wikitty;
+import org.nuiton.wikitty.publication.UiCodeDecorator;
 import org.nuiton.wikitty.publication.WikittyPublicationConfig;
 import org.nuiton.wikitty.publication.WikittyPublicationConstant;
 import org.nuiton.wikitty.publication.entities.WikittyPubText;
@@ -129,6 +132,20 @@
             } else {
                 String content = WikittyPubTextHelper.getContent(w);
 
+                UiCodeDecorator decorator= new UiCodeDecorator();
+                
+
+                if (decorator.isTransformationNeeded(w)){
+                    try {
+                        w=decorator.transformPubUIToPubText(w);
+                    } catch (IOException e) {
+                        log.debug("Error when processing the wikitty content");
+                        // TODO Mfortun-2011-07-28 really handle exception
+                        e.printStackTrace();
+                        result = getError(context);
+                    }
+                }
+                
                 if (content == null) {
                     result = getError(context);
                 } else {

    

[Wikitty-commits] r1096 - in trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication: . action

mfortun＠users.nuiton.org