diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index ef32b37..9bb3ef8 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,6 @@ - + + @@ -41,7 +42,8 @@ - + + @@ -83,7 +85,8 @@ - + + @@ -125,7 +128,8 @@ - + + @@ -167,16 +171,11 @@ - - uses - - - uses - uses - + + @@ -218,7 +217,8 @@ - + + @@ -260,7 +260,8 @@ - + + @@ -302,7 +303,8 @@ - + + diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/FormDataObjectToJSON.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/FormDataObjectToJSON.java index 890029e..e21b917 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/FormDataObjectToJSON.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/FormDataObjectToJSON.java @@ -42,7 +42,7 @@ public class FormDataObjectToJSON { GcubeProfileDV profile = geoNaFormDataObject.getGcubeProfileDV(); LOG.debug("The profile is: " + profile); - + String jsonPathExp = String.format("%s%s", profile.getParentName(), profile.getSectionName()); LOG.debug("The json path to build: " + jsonPathExp); // jsonPathExp = "$.chidl1.child2.child3"; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index 61d5398..d16958e 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -1,6 +1,5 @@ package org.gcube.portlets.user.geoportaldataentry.server; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -8,7 +7,6 @@ import java.util.List; import java.util.Map; import org.gcube.application.geoportal.common.model.document.Project; -import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest; import org.gcube.application.geoportal.common.model.rest.TempFile; @@ -32,7 +30,6 @@ import org.gcube.application.geoportalcommon.shared.config.RoleRights; import org.gcube.application.geoportalcommon.shared.config.RoleRights.OPERATION_TYPE; import org.gcube.application.geoportalcommon.shared.exception.GNAConfigException; import org.gcube.application.geoportalcommon.shared.geoportal.GEOPORTAL_DATA_HANDLER; -import org.gcube.application.geoportalcommon.shared.geoportal.LifecycleInformationDV; import org.gcube.application.geoportalcommon.shared.geoportal.ProjectDV; import org.gcube.application.geoportalcommon.shared.geoportal.UseCaseDescriptorDV; import org.gcube.application.geoportalcommon.shared.geoportal.config.FilePathDV; @@ -126,6 +123,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen "Error occurred on converting data, try again or contact the support. Error: " + e.getMessage()); } + /* Project theProject = null; try { @@ -180,13 +178,15 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen LifecycleInformation lifecycleInfo = theProject.getLifecycleInformation(); LifecycleInformationDV liDV = ConvertToDataValueObjectModel.toLifecycleInformationDV(lifecycleInfo); return new CommitReport(theProject.getId(), liDV); - + } catch (Exception e) { LOG.error("Error on uploading files: ", e); throw new Exception( "Error occurred on uploading files, try again or contact the support. Error: " + e.getMessage()); } - + */ + + return null; } public static FilePathDV retrieveFilePathForGcubeProfileFieldName(String fieldName, GcubeProfileDV profile) {