Fixing
This commit is contained in:
parent
1f6512f105
commit
73618a02bd
|
@ -242,6 +242,8 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements
|
||||||
IndexDocumentRequest indexRequest = new IndexDocumentRequest(
|
IndexDocumentRequest indexRequest = new IndexDocumentRequest(
|
||||||
request.getUseCaseDescriptor(),request.getCaller(), request.getContext(),request.getDocument());
|
request.getUseCaseDescriptor(),request.getCaller(), request.getContext(),request.getDocument());
|
||||||
|
|
||||||
|
indexRequest.setCallParameters(parameters);
|
||||||
|
|
||||||
IndexDocumentReport indexReport = null;
|
IndexDocumentReport indexReport = null;
|
||||||
try {
|
try {
|
||||||
indexRequest.setCallParameters(evaluateAdditionalIndexParameters(indexRequest));
|
indexRequest.setCallParameters(evaluateAdditionalIndexParameters(indexRequest));
|
||||||
|
@ -250,6 +252,7 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements
|
||||||
log.error("Unable to serve index request.",e);
|
log.error("Unable to serve index request.",e);
|
||||||
indexReport = new IndexDocumentReport(indexRequest);
|
indexReport = new IndexDocumentReport(indexRequest);
|
||||||
indexReport.setStatus(Report.Status.ERROR);
|
indexReport.setStatus(Report.Status.ERROR);
|
||||||
|
indexReport.setMessages(new ArrayList<>());
|
||||||
indexReport.getMessages().add("Unable to evaluate centroids : "+e.getMessage());
|
indexReport.getMessages().add("Unable to evaluate centroids : "+e.getMessage());
|
||||||
}
|
}
|
||||||
return handleReport(indexReport,report);
|
return handleReport(indexReport,report);
|
||||||
|
|
|
@ -195,6 +195,7 @@ public class ConcessioniLifeCycleManager extends Default3PhaseManager implements
|
||||||
@Override
|
@Override
|
||||||
protected Document evaluateAdditionalIndexParameters(IndexDocumentRequest request) throws IndexingException {
|
protected Document evaluateAdditionalIndexParameters(IndexDocumentRequest request) throws IndexingException {
|
||||||
Document toReturn = super.evaluateAdditionalIndexParameters(request);
|
Document toReturn = super.evaluateAdditionalIndexParameters(request);
|
||||||
|
if(toReturn == null) toReturn = new Document();
|
||||||
Project indexingProject = request.getDocument();
|
Project indexingProject = request.getDocument();
|
||||||
|
|
||||||
// Evaluate to display project IDs
|
// Evaluate to display project IDs
|
||||||
|
|
|
@ -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.ConfigurationException;
|
||||||
import org.gcube.application.geoportal.common.model.rest.QueryRequest;
|
import org.gcube.application.geoportal.common.model.rest.QueryRequest;
|
||||||
import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest;
|
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 org.gcube.common.storagehub.model.exceptions.StorageHubException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
|
@ -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.ContextUtils;
|
||||||
import org.gcube.application.geoportal.common.utils.StorageUtils;
|
import org.gcube.application.geoportal.common.utils.StorageUtils;
|
||||||
import org.gcube.application.geoportal.service.engine.providers.PluginManager;
|
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.application.geoportal.service.utils.UserUtils;
|
||||||
import org.gcube.common.storagehub.client.dsl.FolderContainer;
|
import org.gcube.common.storagehub.client.dsl.FolderContainer;
|
||||||
import org.gcube.common.storagehub.model.exceptions.StorageHubException;
|
import org.gcube.common.storagehub.model.exceptions.StorageHubException;
|
||||||
|
|
|
@ -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.StorageUtils;
|
||||||
import org.gcube.application.geoportal.common.utils.tests.GCubeTest;
|
import org.gcube.application.geoportal.common.utils.tests.GCubeTest;
|
||||||
import org.gcube.application.geoportal.service.BasicServiceTestUnit;
|
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.application.geoportal.service.utils.UserUtils;
|
||||||
import org.gcube.common.storagehub.model.exceptions.StorageHubException;
|
import org.gcube.common.storagehub.model.exceptions.StorageHubException;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
|
|
@ -72,6 +72,11 @@ public class PostgisDBManager implements PostgisDBManagerI {
|
||||||
return conn.prepareStatement(insertStmt);
|
return conn.prepareStatement(insertStmt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PreparedStatement prepareStatement(String stmt) throws SQLException {
|
||||||
|
return conn.prepareStatement(stmt);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int deleteByFieldValue(PostgisTable target, PostgisTable.Field field, Object value) throws SQLException {
|
public int deleteByFieldValue(PostgisTable target, PostgisTable.Field field, Object value) throws SQLException {
|
||||||
|
|
|
@ -16,7 +16,7 @@ public interface PostgisDBManagerI {
|
||||||
PreparedStatement prepareInsertStatement(PostgisTable target, boolean createTable, boolean geometryAsText)
|
PreparedStatement prepareInsertStatement(PostgisTable target, boolean createTable, boolean geometryAsText)
|
||||||
throws SQLException;
|
throws SQLException;
|
||||||
|
|
||||||
PreparedStatement prepareStatement(String stmt);
|
PreparedStatement prepareStatement(String stmt) throws SQLException;
|
||||||
|
|
||||||
|
|
||||||
void deleteTable(String tableName) throws SQLException;
|
void deleteTable(String tableName) throws SQLException;
|
||||||
|
|
|
@ -235,6 +235,13 @@ public class PostgisTable {
|
||||||
toFill.setString(psFieldIndex, ((String) value));
|
toFill.setString(psFieldIndex, ((String) value));
|
||||||
else toFill.setBytes(psFieldIndex, (byte[])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);
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue