From ba13056a99c258e67cf776316b3cd19b240ec7c1 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 17 Mar 2015 17:44:13 +0000
Subject: [PATCH] Updated Resource

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-resources-widget@113635 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../client/charts/ChartViewerPanel.java               | 11 ++++++-----
 src/main/webapp/WEB-INF/web.xml                       | 11 +++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/resourceswidget/client/charts/ChartViewerPanel.java b/src/main/java/org/gcube/portlets/user/td/resourceswidget/client/charts/ChartViewerPanel.java
index 9951c90..e83f007 100644
--- a/src/main/java/org/gcube/portlets/user/td/resourceswidget/client/charts/ChartViewerPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/resourceswidget/client/charts/ChartViewerPanel.java
@@ -67,9 +67,10 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
  */
 public class ChartViewerPanel extends FramedPanel {
 	private static final String COMBO_ZOOM_LEVEL_WIDTH = "100px";
-	private static final int IMAGE_WIDTH = 2000;
-	private static final int IMAGE_HEIGHT = 1000;
-	private static final String RETRIEVE_CHART_FILE_SERVLET = "RetrieveChartFileServlet";
+	private static final int IMAGE_WIDTH = 1024;
+	private static final int IMAGE_HEIGHT = 768;
+	//private static final String RETRIEVE_CHART_FILE_SERVLET = "RetrieveChartFileServlet";
+	private static final String RETRIEVE_FILE_AND_DISCOVER_MIME_TYPE_SERVLET="RetrieveFileAndDiscoverMimeTypeServlet";
 	private static final String ATTRIBUTE_STORAGE_URI = "storageURI";
 
 	private static final String WIDTH = "800px";
@@ -178,10 +179,10 @@ public class ChartViewerPanel extends FramedPanel {
 			return;
 		}
 		Log.debug("InteranlURI: " + internalURITD);
-		final String storageURI = encodeUrlDelimiters(internalURITD.getUri());
+		final String storageURI = encodeUrlDelimiters(internalURITD.getUrl());
 
 		final String path = GWT.getModuleBaseURL()
-				+ RETRIEVE_CHART_FILE_SERVLET;
+				+ RETRIEVE_FILE_AND_DISCOVER_MIME_TYPE_SERVLET;
 
 		chartImageResource = new ImageResource() {
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 9a44c5c..bd78fce 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -17,6 +17,12 @@
 		<servlet-class>org.gcube.portlets.user.td.gwtservice.server.RetrieveChartFileServlet</servlet-class>
 	</servlet>
 	
+	<!-- Retrieve File and Discover Mime Type Servlet -->
+	<servlet>
+		<servlet-name>RetrieveFileAndDiscoverMimeTypeServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.user.td.gwtservice.server.RetrieveFileAndDiscoverMimeTypeServlet</servlet-class>
+	</servlet>
+	
 	<servlet>
 		<servlet-name>jUnitHostImpl</servlet-name>
 		<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>
@@ -34,6 +40,11 @@
 		<url-pattern>/ResourcesWidget/RetrieveChartFileServlet</url-pattern>
 	</servlet-mapping>
 	
+	<!-- Retrieve File And Discover Mime Type Servlet -->
+	<servlet-mapping>
+		<servlet-name>RetrieveFileAndDiscoverMimeTypeServlet</servlet-name>
+		<url-pattern>/ResourcesWidget/RetrieveFileAndDiscoverMimeTypeServlet</url-pattern>
+	</servlet-mapping>
 	
 	<servlet-mapping>
 		<servlet-name>jUnitHostImpl</servlet-name>