From 3314543edd325ec6d667e7737a20b9377292c75e Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 3 Mar 2017 15:58:20 +0000 Subject: [PATCH] Fixed SDMX Export now use agency id git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@144644 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../opexecution/OpExecution4SDMXCodelistExport.java | 2 +- .../opexecution/OpExecution4SDMXDatasetExport.java | 2 +- .../user/td/gwtservice/shared/Constants.java | 4 ++-- .../td/gwtservice/shared/sdmx/SDMXExportSession.java | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistExport.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistExport.java index 180c890..0766963 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistExport.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXCodelistExport.java @@ -98,7 +98,7 @@ public class OpExecution4SDMXCodelistExport extends OpExecutionBuilder { Map map = new HashMap(); map.put(Constants.PARAMETER_REGISTRYBASEURL, destination); - map.put(Constants.PARAMETER_AGENCY, sdmxExportSession.getAgencyName()); + map.put(Constants.PARAMETER_AGENCY, sdmxExportSession.getAgencyId()); map.put(Constants.PARAMETER_ID, sdmxExportSession.getId()); map.put(Constants.PARAMETER_VERSION, sdmxExportSession.getVersion()); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXDatasetExport.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXDatasetExport.java index e052e0e..a95717a 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXDatasetExport.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXDatasetExport.java @@ -98,7 +98,7 @@ public class OpExecution4SDMXDatasetExport extends OpExecutionBuilder { Map map = new HashMap(); map.put(Constants.PARAMETER_REGISTRYBASEURL, destination); - map.put(Constants.PARAMETER_AGENCY, sdmxExportSession.getAgencyName()); + map.put(Constants.PARAMETER_AGENCY, sdmxExportSession.getAgencyId()); map.put(Constants.PARAMETER_ID, sdmxExportSession.getId()); map.put(Constants.PARAMETER_VERSION, sdmxExportSession.getVersion()); map.put(Constants.PARAMETER_OBSVALUECOLUMN, sdmxExportSession.getObsValueColumn().getColumnId()); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java index cae1266..a81d547 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java @@ -31,11 +31,11 @@ public class Constants { public final static String FILE_CSV_MIMETYPE = "text/csv"; public static final String SDMX_CODELIST_EXPORT_DEFAULT_ID = "NEW_CL_DIVISION"; - public static final String SDMX_CODELIST_EXPORT_DEFAULT_AGENCY = "SDMX"; + public static final String SDMX_CODELIST_EXPORT_DEFAULT_AGENCY_ID = "SDMX"; public static final String SDMX_CODELIST_EXPORT_DEFAULT_VERSION = "1.0"; public static final String SDMX_DATASET_EXPORT_DEFAULT_ID = "NEW_DS_DIVISION"; - public static final String SDMX_DATASET_EXPORT_DEFAULT_AGENCY = "SDMX"; + public static final String SDMX_DATASET_EXPORT_DEFAULT_AGENCY_ID = "SDMX"; public static final String SDMX_DATASET_EXPORT_DEFAULT_VERSION = "1.0"; public static final String PARAMETER_ENCODING = "encoding"; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportSession.java index 232411f..42d8d47 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXExportSession.java @@ -27,7 +27,7 @@ public class SDMXExportSession implements Serializable { private TableType exportType; private String id; - private String agencyName; + private String agencyId; private String version; private String registryBaseUrl; @@ -66,12 +66,12 @@ public class SDMXExportSession implements Serializable { this.id = id; } - public String getAgencyName() { - return agencyName; + public String getAgencyId() { + return agencyId; } - public void setAgencyName(String agencyName) { - this.agencyName = agencyName; + public void setAgencyId(String agencyId) { + this.agencyId = agencyId; } public String getVersion() { @@ -110,7 +110,7 @@ public class SDMXExportSession implements Serializable { public String toString() { return "SDMXExportSession [tabResource=" + tabResource + ", agency=" + agency + ", source=" + source + ", exportType=" + exportType - + ", id=" + id + ", agencyName=" + agencyName + ", version=" + + ", id=" + id + ", agencyName=" + agencyId + ", version=" + version + ", registryBaseUrl=" + registryBaseUrl + ", obsValueColumn=" + obsValueColumn + "]"; }