Fixed filename on export
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@102050 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
21ad9f472c
commit
f8691aeb7f
|
@ -87,13 +87,13 @@ public class SessionUtil {
|
||||||
|
|
||||||
// Remove comment for Test
|
// Remove comment for Test
|
||||||
/*
|
/*
|
||||||
* username = Constants.DEFAULT_USER; String scope =
|
username = Constants.DEFAULT_USER; String scope =
|
||||||
* Constants.DEFAULT_SCOPE;
|
Constants.DEFAULT_SCOPE;
|
||||||
*
|
|
||||||
* httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE,
|
httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE,
|
||||||
* username); session = SessionManager.getInstance().getASLSession(
|
username); session = SessionManager.getInstance().getASLSession(
|
||||||
* httpSession.getId(), username); session.setScope(scope);
|
httpSession.getId(), username); session.setScope(scope);
|
||||||
*/
|
*/
|
||||||
} else {
|
} else {
|
||||||
session = SessionManager.getInstance().getASLSession(
|
session = SessionManager.getInstance().getASLSession(
|
||||||
httpSession.getId(), username);
|
httpSession.getId(), username);
|
||||||
|
|
|
@ -8,6 +8,7 @@ import java.util.ArrayList;
|
||||||
|
|
||||||
import org.gcube.portlets.user.td.gwtservice.shared.destination.Destination;
|
import org.gcube.portlets.user.td.gwtservice.shared.destination.Destination;
|
||||||
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
|
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
|
||||||
|
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -19,19 +20,22 @@ public class CSVExportSession implements Serializable {
|
||||||
|
|
||||||
private static final long serialVersionUID = 407790340509190329L;
|
private static final long serialVersionUID = 407790340509190329L;
|
||||||
|
|
||||||
protected String id;
|
private String id;
|
||||||
protected Destination destination;
|
private Destination destination;
|
||||||
protected String itemId;
|
private String itemId;
|
||||||
protected String fileName;
|
private String fileName;
|
||||||
protected String fileDescription;
|
private String fileDescription;
|
||||||
protected ArrayList<ColumnData> columns;
|
private ArrayList<ColumnData> columns;
|
||||||
protected String encoding;
|
private String encoding;
|
||||||
protected String separator;
|
private String separator;
|
||||||
protected boolean exportViewColumns;
|
private boolean exportViewColumns;
|
||||||
|
private TabResource tabResource;
|
||||||
|
|
||||||
public CSVExportSession() {
|
public CSVExportSession() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public ArrayList<ColumnData> getColumns() {
|
public ArrayList<ColumnData> getColumns() {
|
||||||
return columns;
|
return columns;
|
||||||
|
@ -120,6 +124,16 @@ public class CSVExportSession implements Serializable {
|
||||||
public void setExportViewColumns(boolean exportViewColumns) {
|
public void setExportViewColumns(boolean exportViewColumns) {
|
||||||
this.exportViewColumns = exportViewColumns;
|
this.exportViewColumns = exportViewColumns;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public TabResource getTabResource() {
|
||||||
|
return tabResource;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTabResource(TabResource tabResource) {
|
||||||
|
this.tabResource = tabResource;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
|
@ -127,7 +141,10 @@ public class CSVExportSession implements Serializable {
|
||||||
+ ", itemId=" + itemId + ", fileName=" + fileName
|
+ ", itemId=" + itemId + ", fileName=" + fileName
|
||||||
+ ", fileDescription=" + fileDescription + ", columns="
|
+ ", fileDescription=" + fileDescription + ", columns="
|
||||||
+ columns + ", encoding=" + encoding + ", separator="
|
+ columns + ", encoding=" + encoding + ", separator="
|
||||||
+ separator + ", exportViewColumns=" + exportViewColumns + "]";
|
+ separator + ", exportViewColumns=" + exportViewColumns
|
||||||
|
+ ", tabResource=" + tabResource + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ import java.util.ArrayList;
|
||||||
|
|
||||||
import org.gcube.portlets.user.td.gwtservice.shared.destination.Destination;
|
import org.gcube.portlets.user.td.gwtservice.shared.destination.Destination;
|
||||||
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
|
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
|
||||||
|
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -19,13 +20,14 @@ public class JSONExportSession implements Serializable {
|
||||||
|
|
||||||
private static final long serialVersionUID = 407790340509190329L;
|
private static final long serialVersionUID = 407790340509190329L;
|
||||||
|
|
||||||
protected String id;
|
private String id;
|
||||||
protected Destination destination;
|
private Destination destination;
|
||||||
protected String itemId;
|
private String itemId;
|
||||||
protected String fileName;
|
private String fileName;
|
||||||
protected String fileDescription;
|
private String fileDescription;
|
||||||
protected ArrayList<ColumnData> columns;
|
private ArrayList<ColumnData> columns;
|
||||||
protected boolean exportViewColumns;
|
private boolean exportViewColumns;
|
||||||
|
private TabResource tabResource;
|
||||||
|
|
||||||
public JSONExportSession() {
|
public JSONExportSession() {
|
||||||
super();
|
super();
|
||||||
|
@ -103,15 +105,25 @@ public class JSONExportSession implements Serializable {
|
||||||
public void setExportViewColumns(boolean exportViewColumns) {
|
public void setExportViewColumns(boolean exportViewColumns) {
|
||||||
this.exportViewColumns = exportViewColumns;
|
this.exportViewColumns = exportViewColumns;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public TabResource getTabResource() {
|
||||||
|
return tabResource;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTabResource(TabResource tabResource) {
|
||||||
|
this.tabResource = tabResource;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "JSONExportSession [id=" + id + ", destination=" + destination
|
return "JSONExportSession [id=" + id + ", destination=" + destination
|
||||||
+ ", itemId=" + itemId + ", fileName=" + fileName
|
+ ", itemId=" + itemId + ", fileName=" + fileName
|
||||||
+ ", fileDescription=" + fileDescription + ", columns="
|
+ ", fileDescription=" + fileDescription + ", columns="
|
||||||
+ columns + ", exportViewColumns=" + exportViewColumns + "]";
|
+ columns + ", exportViewColumns=" + exportViewColumns
|
||||||
|
+ ", tabResource=" + tabResource + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue