[metcat] r208 committed - bugs fixed

[metcat.apach...@codespot.com]

Revision: 208
Author: tobha...@gmail.com
Date: Wed Aug 29 04:22:23 2012
Log: bugs fixed
http://code.google.com/a/apache-extras.org/p/metcat/source/detail?r=208

Modified:

/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/api/MetCatAPI.java

/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/CassandraDataModelImpl.java

/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/model/WorkflowIO.java

=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/api/MetCatAPI.java
Wed Aug 29 01:52:17 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/api/MetCatAPI.java
Wed Aug 29 04:22:23 2012
@@ -197,16 +197,20 @@
JSONObject json;
try {
String input = wfIOs.getWorkflowInputs(workflowID);
- String[] values = input.split(":_DELIMITER_:");
- json = new JSONObject();
- json.put("Workflow Input", values[0]);
- array.put(json);
+ if(input!=null){
+ String[] values = input.split(":_DELIMITER_:");
+ json = new JSONObject();
+ json.put("Workflow Input", values[0]);
+ array.put(json);
+ }

String output = wfIOs.getWorkflowOutputs(workflowID);
- values = output.split(":_DELIMITER_:");
- json = new JSONObject();
- json.put("Workflow Output", values[0]);
- array.put(json);
+ if(output!=null){
+ String[] values = output.split(":_DELIMITER_:");
+ json = new JSONObject();
+ json.put("Workflow Output", values[0]);
+ array.put(json);
+ }
} catch (Exception e) {
e.printStackTrace(); // To change body of catch statement use File |
// Settings | File Templates.
=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/CassandraDataModelImpl.java
Tue Aug 28 22:00:20 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/CassandraDataModelImpl.java
Wed Aug 29 04:22:23 2012
@@ -333,8 +333,7 @@
public Map<String, String> getValuesInSingleRowWithRange(String tableName,
String rowID, String rangeValue1,
String rangeValue2) throws Exception {
- return
this.getValuesInSingleRow(ModelConfig.KEYSPACE,tableName,rowID);
-
+ return this.getValuesInSingleRowWithRange(ModelConfig.KEYSPACE,
tableName, rowID, rangeValue1, rangeValue2);
}

@Override
=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/model/WorkflowIO.java
Thu Aug 23 17:55:36 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/model/WorkflowIO.java
Wed Aug 29 04:22:23 2012
@@ -125,21 +125,21 @@
}

public String getWorkflowInputs(String workflowID) throws Exception {
- Map<String, String> map =
this.datamodelImpl.getXnumberOfColumnsInSingleRow(
- ModelConfig.WORKFLOW_NODE_INPUT_COLUMN_FAMILY,
workflowID, "WORKFLOW", "WORKFLOWZ", 1, true);
+ Map<String, String> map =
this.datamodelImpl.getValuesInSingleRowWithRange(
+ ModelConfig.WORKFLOW_NODE_INPUT_COLUMN_FAMILY,
workflowID, "WORKFLOW", "WORKFLOWZ");
for(String key : map.keySet()){
return map.get(key);
}
- return "";
+ return null;
}

public String getWorkflowOutputs(String workflowID) throws Exception {
- Map<String, String> map =
this.datamodelImpl.getXnumberOfColumnsInSingleRow(
- ModelConfig.WORKFLOW_NODE_OUTPUT_COLUMN_FAMILY,
workflowID, "WORKFLOW", "WORKFLOWZ", 1, true);
+ Map<String, String> map =
this.datamodelImpl.getValuesInSingleRowWithRange(
+ ModelConfig.WORKFLOW_NODE_OUTPUT_COLUMN_FAMILY,
workflowID, "WORKFLOW", "WORKFLOWZ");
for(String key : map.keySet()){
return map.get(key);
}
- return "";
+ return null;
}

}