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

[Khue Nguyen]

knguyen     2004/10/05 21:07:03 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/htmlparser TidyHtmlParser.java 
  Log:
  - hide not recognized tag to tidy, allowing world copy/past
  
  Revision  Changes    Path
  1.8.2.2   +17 -0     jahia/src/java/org/jahia/services/htmlparser/TidyHtmlParser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/htmlparser/TidyHtmlParser.java.diff?r1=1.8.2.1&r2=1.8.2.2&f=h
  
  
  
  Index: TidyHtmlParser.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/htmlparser/Attic/TidyHtmlParser.java,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- TidyHtmlParser.java       26 Jul 2004 16:48:39 -0000      1.8.2.1
  +++ TidyHtmlParser.java       5 Oct 2004 19:07:02 -0000       1.8.2.2
  @@ -34,6 +34,7 @@
   import org.jahia.registries.ServicesRegistry;
   import org.jahia.utils.JahiaTools;
   import org.jahia.utils.TextHtml;
  +import java.util.ArrayList;
   
   /**
    *
  @@ -191,6 +192,22 @@
   
               } else if ( tidy.getParseErrors() > 0 ){
                   result = "<TIDYERRORS>\n" + strErr.toString() + "</TIDYERRORS>";
  +                result = JahiaTools.replacePatternIgnoreCase(result," is not 
recognized!","@@@");
  +                String[] errors = 
org.jahia.utils.JahiaTools.getTokens(result,"@@@");
  +                if ( errors.length>0 ){
  +                    String token = "";
  +                    ArrayList tags = new ArrayList();
  +                    String tag = null;
  +                    String newInput = input;
  +                    for (int i = 0; i < errors.length; i++) {
  +                        token = errors[i];
  +                        tag = token.substring(token.lastIndexOf("<"),
  +                                              token.lastIndexOf(">"));
  +                        newInput = 
JahiaTools.replacePatternIgnoreCase(newInput,tag,"$$$notrecognizedtag$$$"+tag.substring(1));
  +                    }
  +                    result = parse( newInput, siteId, tidyConfig, DOMVisitors);
  +                    result = JahiaTools.replacePatternIgnoreCase 
(result,"$$$notrecognizedtag$$$","<");
  +                }
               }
           } catch (Exception e) {
               e.printStackTrace();