cvs commit: jahia/src/java/org/jahia/services/htmlparser NekoHtmlParser.java

[Khue Nguyen]

knguyen     2005/01/07 18:27:56 CET

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/htmlparser NekoHtmlParser.java 
  Log:
  - neko issue
  
  Revision  Changes    Path
  1.1.2.3   +9 -1      
jahia/src/java/org/jahia/services/htmlparser/NekoHtmlParser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/htmlparser/NekoHtmlParser.java.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
  
  
  
  Index: NekoHtmlParser.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/htmlparser/Attic/NekoHtmlParser.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- NekoHtmlParser.java       17 Dec 2004 16:43:10 -0000      1.1.2.2
  +++ NekoHtmlParser.java       7 Jan 2005 17:27:55 -0000       1.1.2.3
  @@ -11,6 +11,7 @@
   import org.cyberneko.html.parsers.*;
   import org.jahia.utils.fileparsers.*;
   import org.w3c.dom.*;
  +import org.jahia.utils.JahiaTools;
   
   /**
    *
  @@ -23,6 +24,8 @@
    */
   public class NekoHtmlParser implements HtmlParser {
   
  +    public static String AMPERSAND = "$$$amp$$$";
  +
       private static org.apache.log4j.Logger logger =
                   org.apache.log4j.Logger.getLogger(NekoHtmlParser.class);
   
  @@ -83,6 +86,7 @@
           }
   
           String result = new String(input);
  +        result = JahiaTools.replacePattern(result, "&", AMPERSAND);
   
           ByteArrayInputStream strIn;
           ByteArrayOutputStream strOut = new ByteArrayOutputStream();
  @@ -127,7 +131,7 @@
               // and thus can be used for all intents and purposes as a 
serializer.
               Transformer serializer = tfactory.newTransformer();
   
  -            serializer.setOutputProperty(OutputKeys.METHOD, "xml");
  +            serializer.setOutputProperty(OutputKeys.METHOD, "html");
               serializer.setOutputProperty(OutputKeys.INDENT, "yes");
               if ( charSet != null ){
                   serializer.setOutputProperty(OutputKeys.ENCODING, charSet);
  @@ -141,6 +145,10 @@
               } else {
                   result = strOut.toString(charSet);
               }
  +
  +            result = JahiaTools.text2XMLEntityRef(result, 1);
  +            result = JahiaTools.replacePattern(result, AMPERSAND, "&");
  +
           } catch ( Throwable t ){
               logger.debug(t);
               return input;