gCubeSystem
/
data-miner-manager-cl
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ref 11711: SAI - Add a simple text viewer so that log files created by Data Miner algorithms can be directly viewed in the browser 

https://support.d4science.org/issues/11711

Added service info[ticket #12594]
Added support to show log information [ticket #11711]
Added support to show files html, json, pdf, txt [ticket #17106]
Updated information show to the user when a computation is submitted [ticket #17030]

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/data-miner-manager-cl@181895 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2019-10-01 15:38:09 +00:00
parent a39d350e59
commit c0ca117ccf
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/data/analysis/dataminermanagercl/server/dmservice/SClient4WPS.java
View File

@ -139,7 +139,7 @@ public class SClient4WPS extends SClient {
}
try {
serviceAddress = InformationSystemUtils.retrieveServiceAddress(Constants.DATAMINER_SERVICE_CATEGORY,
serviceAddress = InformationSystemUtils.retrieveServiceAddress(Constants.DATA_MINER_SERVICE_CATEGORY,
Constants.DATA_MINER_SERVICE_NAME, serviceCredentials.getScope());
} catch (Exception e) {
logger.error("Error retrieving service address: " + e.getLocalizedMessage(), e);
@ -220,7 +220,7 @@ public class SClient4WPS extends SClient {
if (discoveredByIS) {
logger.info("DataMiner Service discovered by IS");
serviceInfo = InformationSystemUtils.retrieveServiceInfo(
Constants.DATAMINER_SERVICE_CATEGORY, Constants.DATA_MINER_SERVICE_NAME,
Constants.DATA_MINER_SERVICE_CATEGORY, Constants.DATA_MINER_SERVICE_NAME,
serviceCredentials.getScope());
} else {
logger.info("DataMiner Service not discovered by IS no properties available");

10
src/main/java/org/gcube/data/analysis/dataminermanagercl/server/is/InformationSystemUtils.java
View File

@ -75,9 +75,11 @@ public class InformationSystemUtils {
try {
logger.debug("Retrieve Service Properties");
if (scope == null || scope.length() == 0)
if (scope == null || scope.length() == 0){
logger.error("Invalid request scope: "+scope);
return null;
}
ScopeProvider.instance.set(scope);
SimpleQuery query = ICFactory.queryFor(ServiceEndpoint.class);
@ -109,10 +111,10 @@ public class InformationSystemUtils {
if(propertyWithCategory.length>=2){
serviceProperties.add(new ServiceInfoData(propertyWithCategory[1],property.value(),propertyWithCategory[0]));
} else {
serviceProperties.add(new ServiceInfoData(property.name(), property.value(), Constants.DEFAULT_SERVICE_INFO_CATEGORY));
serviceProperties.add(new ServiceInfoData(property.name(), property.value(), Constants.DATA_MINER_DEFAULT_SERVICE_INFO_CATEGORY));
}
} else {
serviceProperties.add(new ServiceInfoData(property.name(), property.value(), Constants.DEFAULT_SERVICE_INFO_CATEGORY));
serviceProperties.add(new ServiceInfoData(property.name(), property.value(), Constants.DATA_MINER_DEFAULT_SERVICE_INFO_CATEGORY));
}
}

20
src/main/java/org/gcube/data/analysis/dataminermanagercl/shared/Constants.java
View File

@ -9,22 +9,22 @@ package org.gcube.data.analysis.dataminermanagercl.shared;
public class Constants {
public static final boolean DEBUG = false;
public static final boolean TEST_ENABLE = false;
public static final String DEFAULT_USER = "giancarlo.panichi";
public final static String DEFAULT_SCOPE = "/gcube/devNext/NextNext";
public final static String DEFAULT_TOKEN = "";
public static final String DEFAULT_ROLE = "OrganizationMember";
//Data Miner Service Endpoint
public static final String DATAMINER_SERVICE_CATEGORY = "DataAnalysis";
// Data Miner Service Endpoint
public static final String DATA_MINER_SERVICE_CATEGORY = "DataAnalysis";
public static final String DATA_MINER_SERVICE_NAME = "DataMiner";
//Default Service Info Category
public static final String DEFAULT_SERVICE_INFO_CATEGORY = "Generic";
// Default Service Info Category
public static final String DATA_MINER_DEFAULT_SERVICE_INFO_CATEGORY = "Generic";
// WPS Data Miner
public static final String WPSWebProcessingService = "WebProcessingService";
public static final String WPSCancelComputationServlet = "CancelComputationServlet";
}