gCubeSystem
/
gcube-cms-suite
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing

This commit is contained in:
Fabio Sinibaldi 2022-10-27 18:03:05 +02:00
parent 1f6512f105
commit 73618a02bd
8 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java
View File

@ -242,6 +242,8 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements
IndexDocumentRequest indexRequest = new IndexDocumentRequest(
request.getUseCaseDescriptor(),request.getCaller(), request.getContext(),request.getDocument());
indexRequest.setCallParameters(parameters);
IndexDocumentReport indexReport = null;
try {
indexRequest.setCallParameters(evaluateAdditionalIndexParameters(indexRequest));
@ -250,6 +252,7 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements
log.error("Unable to serve index request.",e);
indexReport = new IndexDocumentReport(indexRequest);
indexReport.setStatus(Report.Status.ERROR);
indexReport.setMessages(new ArrayList<>());
indexReport.getMessages().add("Unable to evaluate centroids : "+e.getMessage());
}
return handleReport(indexReport,report);

1
concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java
View File

@ -195,6 +195,7 @@ public class ConcessioniLifeCycleManager extends Default3PhaseManager implements
@Override
protected Document evaluateAdditionalIndexParameters(IndexDocumentRequest request) throws IndexingException {
Document toReturn = super.evaluateAdditionalIndexParameters(request);
if(toReturn == null) toReturn = new Document();
Project indexingProject = request.getDocument();
// Evaluate to display project IDs

1
geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/MongoManagerI.java
View File

@ -12,7 +12,6 @@ import org.gcube.application.geoportal.common.model.document.access.Access;
import org.gcube.application.geoportal.common.model.rest.ConfigurationException;
import org.gcube.application.geoportal.common.model.rest.QueryRequest;
import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest;
import org.gcube.application.geoportal.service.model.internal.faults.*;
import org.gcube.common.storagehub.model.exceptions.StorageHubException;
import java.io.IOException;

1
geoportal-service/src/main/java/org/gcube/application/geoportal/service/engine/mongo/ProfiledMongoManager.java
View File

@ -50,7 +50,6 @@ import org.gcube.application.geoportal.common.model.useCaseDescriptor.*;
import org.gcube.application.geoportal.common.utils.ContextUtils;
import org.gcube.application.geoportal.common.utils.StorageUtils;
import org.gcube.application.geoportal.service.engine.providers.PluginManager;
import org.gcube.application.geoportal.service.model.internal.faults.*;
import org.gcube.application.geoportal.service.utils.UserUtils;
import org.gcube.common.storagehub.client.dsl.FolderContainer;
import org.gcube.common.storagehub.model.exceptions.StorageHubException;

1
geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/LockTests.java
View File

@ -16,7 +16,6 @@ import org.gcube.application.geoportal.common.utils.FileSets;
import org.gcube.application.geoportal.common.utils.StorageUtils;
import org.gcube.application.geoportal.common.utils.tests.GCubeTest;
import org.gcube.application.geoportal.service.BasicServiceTestUnit;
import org.gcube.application.geoportal.service.model.internal.faults.*;
import org.gcube.application.geoportal.service.utils.UserUtils;
import org.gcube.common.storagehub.model.exceptions.StorageHubException;
import org.junit.Before;

5
sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManager.java
View File

@ -72,6 +72,11 @@ public class PostgisDBManager implements PostgisDBManagerI {
return conn.prepareStatement(insertStmt);
}
@Override
public PreparedStatement prepareStatement(String stmt) throws SQLException {
return conn.prepareStatement(stmt);
}
@Override
public int deleteByFieldValue(PostgisTable target, PostgisTable.Field field, Object value) throws SQLException {

2
sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisDBManagerI.java
View File

@ -16,7 +16,7 @@ public interface PostgisDBManagerI {
PreparedStatement prepareInsertStatement(PostgisTable target, boolean createTable, boolean geometryAsText)
throws SQLException;
PreparedStatement prepareStatement(String stmt);
PreparedStatement prepareStatement(String stmt) throws SQLException;
void deleteTable(String tableName) throws SQLException;

7
sdi-plugins/src/main/java/org/gcube/application/cms/sdi/engine/PostgisTable.java
View File

@ -235,6 +235,13 @@ public class PostgisTable {
toFill.setString(psFieldIndex, ((String) value));
else toFill.setBytes(psFieldIndex, (byte[])value);
}
case BOOLEAN: {
if(value instanceof String)
toFill.setBoolean(psFieldIndex,Boolean.parseBoolean(value.toString()));
if(value instanceof Boolean)
toFill.setBoolean(psFieldIndex,(Boolean) value);
}
}
}