From 103128d55a1b58c78f61ac8a0f3095b8181596fc Mon Sep 17 00:00:00 2001 From: acheung12 Date: Thu, 23 Jan 2025 21:00:17 +0000 Subject: [PATCH 1/4] added changes for consumer api --- resources/evaluate.q | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/evaluate.q b/resources/evaluate.q index 6e05947b..773ea909 100644 --- a/resources/evaluate.q +++ b/resources/evaluate.q @@ -147,7 +147,7 @@ originalType ~ `chars; `chars; .axq.i_NONPRIMCODE type data]; - values: ('[removeTrailingNewline; toString] each data); + values: enlist ('[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); @@ -173,7 +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"]] + generateColumns[originalType;isAtom;0b;data;"values"] ]; : .j.j `count`columns!(quantity; columns) }[generateTableColumns; generateColumns]; From 1107387bcb4cea87de1c47afe682383afbb0104c Mon Sep 17 00:00:00 2001 From: acheung12 Date: Mon, 27 Jan 2025 14:09:57 +0000 Subject: [PATCH 2/4] enlisted columns, changed how values columns are listed --- resources/evaluate.q | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/evaluate.q b/resources/evaluate.q index 773ea909..50ce60e1 100644 --- a/resources/evaluate.q +++ b/resources/evaluate.q @@ -147,7 +147,7 @@ originalType ~ `chars; `chars; .axq.i_NONPRIMCODE type data]; - values: enlist ('[removeTrailingNewline; toString] each 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); @@ -173,7 +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;"values"] + enlist generateColumns[originalType;isAtom;0b;data;"values"] ]; : .j.j `count`columns!(quantity; columns) }[generateTableColumns; generateColumns]; From f30208caf8f3464054093c30bdb7f1f2a2e9da56 Mon Sep 17 00:00:00 2001 From: acheung12 Date: Mon, 27 Jan 2025 17:21:29 +0000 Subject: [PATCH 3/4] Added changes to code for generating columns fix --- resources/evaluate.q | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/evaluate.q b/resources/evaluate.q index 50ce60e1..b015759c 100644 --- a/resources/evaluate.q +++ b/resources/evaluate.q @@ -140,15 +140,15 @@ text: -1 _ text]; text }; - generateColumns:{[removeTrailingNewline; toString; originalType; isAtom; isKey; data; name] + generateColumns:{[removeTrailingNewline; toString; originalType; isAtomic; isKey; data; name] types: $[ - isAtom; + isAtomic; originalType; originalType ~ `chars; `chars; .axq.i_NONPRIMCODE type data]; values: ('[removeTrailingNewline; toString] each data); - values: $[type values = 11h; enlist values; values]; + values: $[isAtomic and (1 >= count data); 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]; From 10f782a64ced359d3592bbefda942b498e6e902e Mon Sep 17 00:00:00 2001 From: acheung12 Date: Mon, 27 Jan 2025 17:37:35 +0000 Subject: [PATCH 4/4] Modified how order is calculated --- resources/evaluate.q | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/evaluate.q b/resources/evaluate.q index b015759c..876bda45 100644 --- a/resources/evaluate.q +++ b/resources/evaluate.q @@ -149,7 +149,8 @@ .axq.i_NONPRIMCODE type data]; values: ('[removeTrailingNewline; toString] each data); values: $[isAtomic and (1 >= count data); enlist values; values]; - order: $[1 ~ count data; iasc enlist data; iasc data]; + formatData: $[1 ~ count data; enlist data; data]; + order:@[{iasc x}; formatData; {"Not Yet Implemented for the input"}]; returnDictionary: `name`type`values`order!(name;types;values;order); if[isKey; returnDictionary[`isKey]: isKey]; if[attr[data] <> `; returnDictionary[`attributes]: attr data];