gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@99597 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-09-09 10:28:51 +00:00
parent fc97ecbde9
commit 93c2f4f266
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/tabular-data-gwt-service-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/tabular-data-gwt-service-2.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/tabular-data-gwt-service-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/tabular-data-gwt-service-2.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -33,5 +33,5 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/> <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/tabular-data-gwt-service-2.3.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/tabular-data-gwt-service-2.4.0-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

11
src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4ExtractCodelist.java
View File

@ -43,15 +43,22 @@ public class OpExecution4ExtractCodelist extends
logger.debug(extractCodelistSession.toString()); logger.debug(extractCodelistSession.toString());
OperationDefinition operationDefinition; OperationDefinition operationDefinition;
String resourceName=null;
if(extractCodelistSession.getTabResource()!=null){
resourceName=extractCodelistSession.getTabResource().getName();
}
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
ExtractCodelistOperationMap extractMap = new ExtractCodelistOperationMap(); ExtractCodelistOperationMap extractMap = new ExtractCodelistOperationMap();
ArrayList<Map<String, Object>> compositeValue = extractMap ArrayList<Map<String, Object>> compositeValue = extractMap
.genMap(extractCodelistSession); .genMap(extractCodelistSession);
operationDefinition = OperationDefinitionMap.map( operationDefinition = OperationDefinitionMap.map(
OperationsId.ExtractCodelist.toString(), service); OperationsId.ExtractCodelist.toString(), service);
map.put(Constants.PARAMETER_EXTRACT_CODELIST_RESOURCE_NAME, resourceName);
map.put(Constants.PARAMETER_EXTRACT_CODELIST_COMPOSITE, compositeValue); map.put(Constants.PARAMETER_EXTRACT_CODELIST_COMPOSITE, compositeValue);
invocation = new OperationExecution( invocation = new OperationExecution(

3
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java
View File

@ -12,7 +12,7 @@ package org.gcube.portlets.user.td.gwtservice.shared;
*/ */
public class Constants { public class Constants {
public final static String VERSION = "2.3.0"; public final static String VERSION = "2.4.0";
public final static String DEFAULT_USER = "test.user"; public final static String DEFAULT_USER = "test.user";
public final static String DEFAULT_SCOPE = "/gcube/devsec/devVRE"; public final static String DEFAULT_SCOPE = "/gcube/devsec/devVRE";
@ -60,6 +60,7 @@ public class Constants {
public static final String PARAMETER_EXTRACT_CODELIST_METADATA = "metadata"; public static final String PARAMETER_EXTRACT_CODELIST_METADATA = "metadata";
public static final String PARAMETER_EXTRACT_CODELIST_DEFAULT = "default"; public static final String PARAMETER_EXTRACT_CODELIST_DEFAULT = "default";
public static final String PARAMETER_EXTRACT_CODELIST_COMPOSITE = "mapping"; public static final String PARAMETER_EXTRACT_CODELIST_COMPOSITE = "mapping";
public static final String PARAMETER_EXTRACT_CODELIST_RESOURCE_NAME = "resource_name";
public static final String PARAMETER_EDIT_ROW_CONDITION = "condition"; public static final String PARAMETER_EDIT_ROW_CONDITION = "condition";