Merge pull request #498 from KxSystems/ee-wrapper

Updated q and Python wrapper functions

Author: ecmel

resources/evaluate.q

@@ -148,6 +148,7 @@
   `chars;
   .axq.i_NONPRIMCODE type data];
   values: ('[removeTrailingNewline; toString] each data);
+  values: $[type values = 11h; enlist values; values];
   order: $[1 ~ count data; iasc enlist data; iasc data];
   returnDictionary: `name`type`values`order!(name;types;values;order);
   if[isKey; returnDictionary[`isKey]: isKey];
@@ -172,6 +173,7 @@
   (generateColumns[::;0b;1b;key data;"key"]; generateColumns[::;0b;0b;value data;"values"]);
   isTable;
   generateTableColumns[originalType;isAtom;0b;data];
+  generateColumns[originalType;isAtom;0b;data;$[isAtom;"value";"values"]]
   ];
   : .j.j `count`columns!(quantity; columns)
   }[generateTableColumns; generateColumns];
@@ -192,12 +194,15 @@
   fn[sampleSize; data]
   }
   result: evalInContext[ctx; splitExpression stripTrailingSemi wrapLines removeMultilineComments code];
-  if[result `errored; :result];
+  if [result `errored; :result];
+  /ggplot - start
   if[type[result[`result]] = 99h;
+  if[type[key[[result[`result]]]] = 11h;
   if[`output in key result[`result]; 
   if[type[result[`result][`output]] = 99h;
   if[`bytes in key result[`result][`output]; 
-  result[`base64]:1b; result[`result]: .Q.btoa result[`result][`output][`bytes]; :result]]]];
+  result[`base64]:1b; result[`result]: .Q.btoa result[`result][`output][`bytes]; :result]]]]];
+  /ggplot - end
   if [returnFormat ~ "text";
   result[`result]: toString result `result];
   if [returnFormat ~ "structuredText";

resources/evaluatePy.q

@@ -97,11 +97,14 @@
  if [`backtrace in key result;
  result[`backtrace]:string result`backtrace];
  if[result `errored; :result];
+ /ggplot - start
  if[type[result[`result]] = 99h;
+ if[type[key[[result[`result]]]] = 11h;
  if[`output in key result[`result]; 
  if[type[result[`result][`output]] = 99h;
  if[`bytes in key result[`result][`output]; 
- result[`base64]:1b; result[`result]: .Q.btoa result[`result][`output][`bytes]; :result]]]];
+ result[`base64]:1b; result[`result]: .Q.btoa result[`result][`output][`bytes]; :result]]]]];
+ /ggplot - end
  result[`result]:
  $[result`errored;
  ::;