knguyen 2004/12/06 17:18:24 CET
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/services/htmlparser TidyHtmlParser.java
Log:
- only use utf8 as char encoding, if tidy charset is not set. This allows one
to force raw encoding if needed.
Revision Changes Path
1.8.2.6 +3 -1
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.5&r2=1.8.2.6&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.5
retrieving revision 1.8.2.6
diff -u -r1.8.2.5 -r1.8.2.6
--- TidyHtmlParser.java 20 Oct 2004 09:46:06 -0000 1.8.2.5
+++ TidyHtmlParser.java 6 Dec 2004 16:18:24 -0000 1.8.2.6
@@ -174,7 +174,9 @@
strIn = new ByteArrayInputStream(strByte);
charsetDet.charsetDetection(strIn);
charSet = charsetDet.getCharset();
- if ( charSet != null && "UTF-8".equalsIgnoreCase(charSet) ){
+
+ if ( (config.getProperty(TidyConfig.CHAR_ENCODING) == null)
+ && "UTF-8".equalsIgnoreCase(charSet) ){
config.setProperty(TidyConfig.CHAR_ENCODING,"utf8");
}
} catch ( Throwable t ){
