From e3061ef9131bebd871f1a8bd1faa6fa195741f72 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 18 May 2016 09:14:33 +0000 Subject: [PATCH] refs 2521: Explore the possibility to port the StatMan interface onto Dataminer https://support.d4science.org/issues/2521 Fixed bootstrap.js git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@128658 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../ComputationParametersPanel.java | 2 +- .../ComputationValueBuilder.java | 19 ++++++++++++------- .../dataminermanager/dataminermanager.gwt.xml | 8 ++++---- src/main/webapp/DataMinerManager.html | 8 +++++--- .../WEB-INF/jsp/DataMinerManager_view.jsp | 6 +++++- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java index 83d14af..f590c8b 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java @@ -107,7 +107,7 @@ public class ComputationParametersPanel extends SimpleContainer { descr = (descr == null || descr.contentEquals("")) ? "no-description" : operator.getDescription();// display:block;clear:both;' HtmlLayoutContainer description = new HtmlLayoutContainer( - "" + descr + "" + descr + ""); description.addStyleName("workflow-description"); v.add(description, new VerticalLayoutData(-1, -1, new Margins(0))); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/computationsvalue/ComputationValueBuilder.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/computationsvalue/ComputationValueBuilder.java index 8c1c432..4b065f3 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/computationsvalue/ComputationValueBuilder.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/computationsvalue/ComputationValueBuilder.java @@ -1,6 +1,5 @@ package org.gcube.portlets.user.dataminermanager.server.smservice.wps.computationsvalue; -import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.util.LinkedHashMap; @@ -34,8 +33,13 @@ public class ComputationValueBuilder { String value = valueParameters.get(key); if (value != null && !value.isEmpty() && value.startsWith("http")) { - ComputationValue computationValue = retrieveFileName(value); - computationsValueParameters.put(key, computationValue); + if (value.contains("|")) { + ComputationValue valueString = new ComputationValue(value); + computationsValueParameters.put(key, valueString); + } else { + ComputationValue computationValue = retrieveFileName(value); + computationsValueParameters.put(key, computationValue); + } } else { ComputationValue valueString = new ComputationValue(value); computationsValueParameters.put(key, valueString); @@ -63,11 +67,12 @@ public class ComputationValueBuilder { conn.setDoOutput(true); conn.connect(); if (conn.getResponseCode() != 200) { - logger.error("Response Code: "+conn.getResponseCode()); + logger.error("Retrieve File Name Response Code: " + + conn.getResponseCode()); try { Thread.sleep(5000); } catch (InterruptedException e) { - + } } attempts++; @@ -79,8 +84,8 @@ public class ComputationValueBuilder { return new ComputationValueFile(value, null, null); } - } catch (IOException e) { - logger.error(e.getLocalizedMessage()); + } catch (Throwable e) { + logger.error("Retrieve File Name: " + e.getLocalizedMessage()); e.printStackTrace(); return new ComputationValueFile(value, null, null); } diff --git a/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml b/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml index cd545d1..cf802d0 100644 --- a/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml @@ -41,19 +41,19 @@ - + - + diff --git a/src/main/webapp/DataMinerManager.html b/src/main/webapp/DataMinerManager.html index 6b19e11..d1223f7 100644 --- a/src/main/webapp/DataMinerManager.html +++ b/src/main/webapp/DataMinerManager.html @@ -9,9 +9,11 @@ Data Miner Manager - - + + diff --git a/src/main/webapp/WEB-INF/jsp/DataMinerManager_view.jsp b/src/main/webapp/WEB-INF/jsp/DataMinerManager_view.jsp index 059dae6..eaa450c 100644 --- a/src/main/webapp/WEB-INF/jsp/DataMinerManager_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/DataMinerManager_view.jsp @@ -13,7 +13,11 @@ -<%-- --%> + + +