You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/10/30 02:58:37 UTC
svn commit: r1195087 - in /incubator/airavata/trunk/modules:
commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java
xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
Author: lahiru
Date: Sun Oct 30 01:58:36 2011
New Revision: 1195087
URL: http://svn.apache.org/viewvc?rev=1195087&view=rev
Log:
fix error on saving on the wrong workflow IO tag + change to save input node rather than document node in workflow data
Modified:
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java?rev=1195087&r1=1195086&r2=1195087&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/JCRRegistry.java Sun Oct 30 01:58:36 2011
@@ -881,11 +881,11 @@ public class JCRRegistry extends Observa
}
public boolean saveWorkflowInput(WorkflowIOData workflowInputData) {
- return saveWorkflowIO(workflowInputData, OUTPUT);
+ return saveWorkflowIO(workflowInputData, INPUT);
}
public boolean saveWorkflowOutput(WorkflowIOData workflowOutputData) {
- return saveWorkflowIO(workflowOutputData, INPUT);
+ return saveWorkflowIO(workflowOutputData, OUTPUT);
}
private boolean saveWorkflowIO(WorkflowIOData workflowOutputData, String type) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1195087&r1=1195086&r2=1195087&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java Sun Oct 30 01:58:36 2011
@@ -89,12 +89,13 @@ public final class ProvenanceWrite imple
if (null != node && !(node instanceof InputNode)) {
XmlElement elem = XmlConstants.BUILDER.newFragment("previousdat");
+ XmlElement inputs = null;
if (node instanceof WSNode) {
String nodeID = node.getComponent().getName();
XmlElement nodeElement = elem.newElement("wsnode");
elem.addChild(nodeElement);
nodeElement.addChild(nodeID);
- XmlElement inputs = elem.newElement("inputs");
+ inputs = elem.newElement("inputs");
elem.addChild(inputs);
List<DataPort> portsToBeSaved = node.getInputPorts();
@@ -120,7 +121,7 @@ public final class ProvenanceWrite imple
XmlElement nodeElement = elem.newElement("foreach");
elem.addChild(nodeElement);
nodeElement.addChild(nodeID);
- XmlElement inputs = elem.newElement("inputs");
+ inputs = elem.newElement("inputs");
elem.addChild(inputs);
XmlConstants.BUILDER.serializeToString(elem);
if (middleNode instanceof ForEachExecutableNode) {
@@ -170,9 +171,12 @@ public final class ProvenanceWrite imple
}
}
- this.registry.saveWorkflowInput(new WorkflowIOData(xsul5.XmlConstants.BUILDER.serializeToString(elem), experimentId, node.getID(),this.workflowName));
- // deal with the outputs
-
+ if (inputs!=null) {
+ this.registry.saveWorkflowInput(new WorkflowIOData(
+ xsul5.XmlConstants.BUILDER.serializeToString(inputs),
+ experimentId, node.getID(), this.workflowName));
+ // deal with the outputs
+ }
XmlElement outputs = elem.newElement("outputs");
elem.addChild(outputs);