Author: bleny Date: 2011-02-03 14:36:10 +0000 (Thu, 03 Feb 2011) New Revision: 977 Log: fix bad encoding in diagrams Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java 2011-02-03 12:27:44 UTC (rev 976) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java 2011-02-03 14:36:10 UTC (rev 977) @@ -26,9 +26,13 @@ import fr.ifremer.wao.ui.pages.PieChart; import org.apache.tapestry5.Link; import org.apache.tapestry5.services.PageRenderLinkSource; +import org.nuiton.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + /** * Implementation of {@link ServiceChart} that create urls to charts. * This implementation only redirect to Wao pages like for example {@link PieChart}. @@ -53,14 +57,41 @@ public String getPieChartUrl(PieChartData data, int size, boolean thumb) { // Create link to PieChart. This page is used to redirect // data to the correct chartServlet - Link link = pageRender.createPageRenderLinkWithContext( - PieChart.class, data, size, thumb); + // Link link = pageRender.createPageRenderLink(PieChart.class); + // String urlPrefix = link.toAbsoluteURI(); +// Link link = pageRender.createPageRenderLinkWithContext(PieChart.class, +// data, size, thumb); +// String url = link.toAbsoluteURI(); - String url = link.toAbsoluteURI(); + // adding context to the url manually, + + // String url = urlPrefix + "/" + data.getData() + "/" + size + "/" + thumb; + // String url = urlPrefix + "/" + StringUtil.unaccent(data.getData()) + "/" + size + "/" + thumb; + // URLEncoder.encode(url, "UTF-8"); +// try { +// url = URLEncoder.encode(url, "ISO-8859-1"); +// } catch (UnsupportedEncodingException e) { +// throw new RuntimeException(e); +// } + + + // createPageRenderLinkWithContext make the data.getData() part with bad + // encoding : accents (like in 'Réalisés') + // are not well converted. add UTF-8 encoding do not solve the issue, so + // bypassing this servlet by returning a direct link to eastwood + String url = super.getPieChartUrl(data, size, thumb); + if (logger.isDebugEnabled()) { logger.debug("url for pie chart : " + url); } return url; } +/* @Override + protected String getBaseUrl() { + // Get only the first element in the server_path which is the host name of the server + String[] res = WaoProperty.SERVER_PATH.getValue().split("/"); + return "http://" + res[0]; + }*/ + }