Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KXI-59012 Make structuredText results easier for consumers to use #507

Merged
merged 5 commits into from
Jan 27, 2025
Merged

KXI-59012 Make structuredText results easier for consumers to use #507

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
103128d
added changes for consumer api
acheung12 Jan 23, 2025
1107387
enlisted columns, changed how values columns are listed
acheung12 Jan 27, 2025
f30208c
Added changes to code for generating columns fix
acheung12 Jan 27, 2025
10f782a
Modified how order is calculated
acheung12 Jan 27, 2025
fecb825
Merge branch 'dev' into KXI-59012
Philip-Carneiro-KX Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions resources/evaluate.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,17 @@
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];
order: $[1 ~ count data; iasc enlist data; iasc data];
values: $[isAtomic and (1 >= count data); enlist values; values];
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];
Expand All @@ -173,7 +174,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"]]
enlist generateColumns[originalType;isAtom;0b;data;"values"]
];
: .j.j `count`columns!(quantity; columns)
}[generateTableColumns; generateColumns];
Expand Down