airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1423203 - /airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Date Mon, 17 Dec 2012 22:34:39 GMT
Author: chathuri
Date: Mon Dec 17 22:34:38 2012
New Revision: 1423203

URL: http://svn.apache.org/viewvc?rev=1423203&view=rev
Log:
fixing node name not saving when workflow node saving

Modified:
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1423203&r1=1423202&r2=1423203&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Mon Dec 17 22:34:38 2012
@@ -46,10 +46,8 @@ import org.apache.airavata.client.api.Ai
 import org.apache.airavata.common.utils.Pair;
 import org.apache.airavata.common.utils.WSDLUtil;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
+import org.apache.airavata.registry.api.workflow.*;
 import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
-import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
 import org.apache.airavata.workflow.model.component.Component;
 import org.apache.airavata.workflow.model.component.amazon.InstanceComponent;
 import org.apache.airavata.workflow.model.component.amazon.TerminateInstanceComponent;
@@ -190,7 +188,7 @@ public class WorkflowInterpreter {
                 workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.INPUTNODE);
                 WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(new
WorkflowExecution(getConfig().getTopic(),
                         getConfig().getTopic()), node.getID());
-                this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeInput(workflowInstanceNode,
(String)values[i]);
+                this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeInput(workflowInstanceNode,
keywords[i] + "=" + (String) values[i]);
                 this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowNodeType(workflowInstanceNode,
workflowNodeType);
 			}
 			this.config.getNotifier().workflowStarted(values, keywords);
@@ -427,7 +425,9 @@ public class WorkflowInterpreter {
                     WorkflowNodeType workflowNodeType = new WorkflowNodeType();
                     workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.OUTPUTNODE);
                     WorkflowInstanceNode workflowInstanceNode = new WorkflowInstanceNode(new
WorkflowExecution(config.getTopic(), config.getTopic()), node.getID());
-                    this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeOutput(workflowInstanceNode,
((OutputNode) node).getDescription());
+                    String portname = node.getName();
+                    String portValue = ((OutputNode) node).getDescription();
+                    this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowInstanceNodeOutput(workflowInstanceNode,
portname + "=" + portValue);
                     this.getConfig().getConfiguration().getAiravataAPI().getProvenanceManager().setWorkflowNodeType(workflowInstanceNode,
workflowNodeType);
 
 					if (this.config.isActOnProvenance()) {



Mime
View raw message