knguyen 2004/09/29 14:42:30 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/services/htmlparser
JahiaTextContentTidy.java
Log:
- multivalues, jahia expression and tidy issue
Revision Changes Path
1.5.2.2 +6 -0
jahia/src/java/org/jahia/services/htmlparser/JahiaTextContentTidy.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/htmlparser/JahiaTextContentTidy.java.diff?r1=1.5.2.1&r2=1.5.2.2&f=h
Index: JahiaTextContentTidy.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/htmlparser/Attic/JahiaTextContentTidy.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- JahiaTextContentTidy.java 14 May 2004 14:30:40 -0000 1.5.2.1
+++ JahiaTextContentTidy.java 29 Sep 2004 12:42:30 -0000 1.5.2.2
@@ -48,6 +48,8 @@
public static String JAHIA_HTML_TAG_NAME = "jahiahtml";
public static String JAHIA_HTML_OPEN_TAG = "<jahiahtml>";
+ public static String JAHIA_RESOURCE_MARKER = "jahia$resource$marker";
+ public static String JAHIA_EXPRESSION_MARKER = "jahia$expression$marker";
public static String JAHIA_HTML_CLOSE_TAG = "</jahiahtml>";
public static String NEW_LINE = "$$$nl$$$";
public static String WHITE_SPACE = "$$$ws$$$";
@@ -68,6 +70,8 @@
String result = input.trim();
result =
JahiaTools.replacePatternIgnoreCase(result,"<html>",JAHIA_HTML_OPEN_TAG);
result =
JahiaTools.replacePatternIgnoreCase(result,"</html>",JAHIA_HTML_CLOSE_TAG);
+ result =
JahiaTools.replacePatternIgnoreCase(result,"<jahia-resource",JAHIA_RESOURCE_MARKER);
+ result =
JahiaTools.replacePatternIgnoreCase(result,"<jahia-expression",JAHIA_EXPRESSION_MARKER);
result = JahiaTools.replacePattern(result,"\r\n","\n");
result = encodeLineBreak(result,false);
result = encodeTextAreaWhiteSpace(result,true);
@@ -93,6 +97,8 @@
result = JahiaTools.replacePattern(result,"'","'");
result =
JahiaTools.replacePatternIgnoreCase(result,JAHIA_HTML_OPEN_TAG,"<html>");
result =
JahiaTools.replacePatternIgnoreCase(result,JAHIA_HTML_CLOSE_TAG,"</html>");
+ result =
JahiaTools.replacePatternIgnoreCase(result,JAHIA_RESOURCE_MARKER,"<jahia-resource");
+ result =
JahiaTools.replacePatternIgnoreCase(result,JAHIA_EXPRESSION_MARKER,"<jahia-expression");
result = encodeTextAreaWhiteSpace(result,false);
return result.trim();
}
