> 14464 [EMAIL PROTECTED] [PATCH] WebPagePortlet supports> > iso-8859-1 only
>
>I rewrote patch to conform to Coding Spec.
>
_________________________________________________________________
今が旬のクルマを徹底的に分析します MSN 自動車 http://car.msn.co.jp/ Index: src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java,v
retrieving revision 1.13
diff -u -r1.13 WebPagePortlet.java
--- src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java 24 Oct 2002 14:59:25 -0000 1.13
+++ src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java 3 Apr 2003 03:44:46 -0000
@@ -74,6 +74,7 @@
import java.io.Reader;
import java.net.URL;
import java.net.URLConnection;
+import java.util.StringTokenizer;
/**
* A class that loads a web page and filters it to have certain features
@@ -169,14 +170,29 @@
} long pageExpiration = pageConn.getExpiration();
- String encoding = pageConn.getContentEncoding();
+ String encoding = "iso-8859-1";
+ String contentType = pageConn.getContentType();
String tempString = null;
String noCache = "no-cache";- if(encoding == null)
+ if (contentType != null)
{
- // Standard HTTP encoding
- encoding = "iso-8859-1";
+ StringTokenizer st = new StringTokenizer(contentType, "; =");
+ while (st.hasMoreTokens())
+ {
+ if (st.nextToken().equalsIgnoreCase("charset"))
+ {
+ try
+ {
+ encoding = st.nextToken();
+ break;
+ }
+ catch (Exception e)
+ {
+ break;
+ }
+ }
+ }
}/*
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
