Patch for Glue Command

usc-isi-i2 · Sep 18, 2014 · 38eaf4f · 38eaf4f
1 parent 0fcee3f
commit 38eaf4f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/karma-common/src/main/java/edu/isi/karma/controller/history/CommandHistory.java b/karma-common/src/main/java/edu/isi/karma/controller/history/CommandHistory.java
@@ -212,10 +212,13 @@ public JSONObject getCommandJSON(Workspace workspace, ICommand comm) {
 				JSONArray hnodes = (JSONArray) JSONUtil.createJson(inpP.getString(ClientJsonKeys.value.name()));
 				for (int j = 0; j < hnodes.length(); j++) {
 					JSONObject obj = (JSONObject)hnodes.get(j);
-					String hNodeId = obj.getString(ClientJsonKeys.value.name());
-					HNode node = workspace.getFactory().getHNode(hNodeId);
-					JSONArray hNodeRepresentation = node.getJSONArrayRepresentation(workspace.getFactory());
-					obj.put(ClientJsonKeys.value.name(), hNodeRepresentation);
+					Object value = obj.get(ClientJsonKeys.value.name());
+					if (value instanceof String) {
+						String hNodeId = (String) value;
+						HNode node = workspace.getFactory().getHNode(hNodeId);
+						JSONArray hNodeRepresentation = node.getJSONArrayRepresentation(workspace.getFactory());
+						obj.put(ClientJsonKeys.value.name(), hNodeRepresentation);
+					}
 				}
 				inpP.put(ClientJsonKeys.value.name(), hnodes);
 			} else if(HistoryJsonUtil.getParameterType(inpP) == ParameterType.orderedColumns) {

diff --git a/...ommon/src/main/java/edu/isi/karma/controller/history/WorksheetCommandHistoryExecutor.java b/...ommon/src/main/java/edu/isi/karma/controller/history/WorksheetCommandHistoryExecutor.java
@@ -151,7 +151,8 @@ public UpdateContainer normalizeCommandHistoryJsonInput(Workspace workspace, Str
 		HTable hTable = workspace.getWorksheet(worksheetId).getHeaders();
 		for (int i = 0; i < inputArr.length(); i++) {
 			JSONObject inpP = inputArr.getJSONObject(i);
-
+			if (inpP.getString(ClientJsonKeys.name.name()).equals("outputColumns") || inpP.getString(ClientJsonKeys.name.name()).equals("inputColumns"))
+				continue;
 			/*** Check the input parameter type and accordingly make changes ***/
 			if(HistoryJsonUtil.getParameterType(inpP) == ParameterType.hNodeId) {
 				JSONArray hNodeJSONRep = new JSONArray(inpP.get(ClientJsonKeys.value.name()).toString());