[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERExcelLook/Sources/er/directtoweb/excel ERExcelEscapeForXMLWrapper.java, 1.1.2.1, 1.1.2.2

[David S. <ds...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExcelLook/Sources/er/directtoweb/excel
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9379

Modified Files:
      Tag: Wonder_2_0_0_Branch
	ERExcelEscapeForXMLWrapper.java 
Log Message:
added code to strip <style *>xxxxxxxxxxxx</style>  and <script *>xxxxxxxxxxx</script>


Index: ERExcelEscapeForXMLWrapper.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExcelLook/Sources/er/directtoweb/excel/Attic/ERExcelEscapeForXMLWrapper.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ERExcelEscapeForXMLWrapper.java	12 Dec 2006 02:09:10 -0000	1.1.2.1
--- ERExcelEscapeForXMLWrapper.java	26 Jun 2007 22:29:34 -0000	1.1.2.2
***************
*** 16,19 ****
--- 16,20 ----
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;
+ import er.extensions.*;
  
  // This class tries to strip out all the HTML in subcomponents so that it can be generically exported using the Excel libs
***************
*** 60,67 ****
--- 61,77 ----
              Pattern nonBlankingSpacePattern = Pattern.compile("(\\&nbsp\\;)+", Pattern.CASE_INSENSITIVE);
              Pattern collapseWhiteSpacePattern = Pattern.compile("(\\s{2,})+", Pattern.CASE_INSENSITIVE);
+             Pattern stylePattern = Pattern.compile("<style[^>]*>[^<]+</style>", Pattern.CASE_INSENSITIVE);
+             Pattern scriptPattern = Pattern.compile("<script[^>]*>[^<]+</script>", Pattern.CASE_INSENSITIVE);
  
              text = realNewlinePattern.matcher(text).replaceAll("");
              text = htmlNewlinePattern.matcher(text).replaceAll("\n");
              text = nonBlankingSpacePattern.matcher(text).replaceAll(" ");
+             text = stylePattern.matcher(text).replaceAll("");
+             text = scriptPattern.matcher(text).replaceAll("");
+ 
+             String extraRegExToStrip=ERXProperties.stringForKey("er.directtoweb.excel.ERExcelEscapeForXMLWrapper.extraRegExToStrip");
+ 
+             if (extraRegExToStrip != null)
+                 text = text.replaceAll(extraRegExToStrip,"");
  
              text = text.replaceAll("<[^>]+>", ""); // strip ALL HTML tags; it's not worth dealing with.