Skip to content

FIX: new round of fixing. #132

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

Merged
eduard93 merged 1 commit into from
Jul 9, 2025
Merged

FIX: new round of fixing. #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 18 additions & 12 deletions MDX2JSON/ResultSet.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,39 +111,45 @@ Method ProcessOneAxis(CubeIndex, AxisKey, AxisNumber, AxisSize) As %ZEN.proxyObj
set tCubeName = $$$UPPER(..%Cube)
set tQueryKey = ..%QueryKey

set axis=$$$NewDynObj
set axis.tuples = ..ProcessOneAxisCell(CubeIndex, AxisKey, tCubeName, tQueryKey, AxisNumber, 1, AxisSize)
set axis = ..LoopProcessingAxisCells(CubeIndex, AxisKey, tCubeName, tQueryKey, AxisNumber, 1,AxisSize)

return axis
}

Method ProcessOneAxisCell(CubeIndex, AxisKey, CubeName, QueryKey, AxisNumber, Node, AxisSize) As %ZEN.proxyObject [ Internal ]
Method LoopProcessingAxisCells(CubeIndex, AxisKey, CubeName, QueryKey, AxisNumber, Node, AxisSize) As %ZEN.proxyObject [ Internal ]
{
set cell=$$$NewDynObj

set tNode = $G($$$DeepSeeAxisGLVN(CubeIndex,AxisKey,"axes",Node))
set cell.caption = ##class(%DeepSee.UserPortal.Utils).%ResolveText($LG(tNode,5)) // text caption
set cell.vis = $LG(tNode,2) // visibility helper - does not help (apperently it shows if the cell is the lowest level)
// now we process cell children, if any exist
set axis=$$$NewDynObj

if ($D($$$DeepSeeAxisGLVN(CubeIndex, AxisKey, "axes", Node, "ch")) = 10) {
set cell.children = $$$NewDynObjList
set axis.tuples = $$$NewDynObjList
for i=1:1:AxisSize
{
set key = $G(@..%ResultCacheLocation@(..%CubeKey,..%QueryKey,"leaf",AxisNumber,i))
set children = ..ProcessOneAxisCell(CubeIndex, AxisKey, CubeName, QueryKey, AxisNumber, key,)
set children = ..ProcessOneAxisCell(CubeIndex, AxisKey, CubeName, QueryKey, AxisNumber, key)
// Append children to cell
if $isobject(children) {
if ((children.%IsA("%ZEN.proxyObject")) || (children.%IsA("%Library.Object"))) {
$$$Insert(cell.children,children)
$$$Insert(axis.tuples,children)
} elseif ((children.%IsA("%Collection.AbstractList")) || (children.%IsA("%Library.Array"))) {
for i=1:1:$$$ListSize(children) {
$$$Insert(cell.children,$$$ListGet(children,i))
$$$Insert(axis.tuples,$$$ListGet(children,i))
}
}
}
}
}

return axis
}

Method ProcessOneAxisCell(CubeIndex, AxisKey, CubeName, QueryKey, AxisNumber, Node) As %ZEN.proxyObject [ Internal ]
{
set cell=$$$NewDynObj
set tNode = $G($$$DeepSeeAxisGLVN(CubeIndex,AxisKey,"axes",Node))
set cell.caption = ##class(%DeepSee.UserPortal.Utils).%ResolveText($LG(tNode,5)) // text caption
set cell.vis = $LG(tNode,2) // visibility helper - does not help (apperently it shows if the cell is the lowest level)

//To filter out invisible сells
if (..IsCellNull(cell)=1) {
return cell.children
Expand Down
2 changes: 1 addition & 1 deletion module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Export generator="Cache" version="25">
<Document name="MDX2JSON.ZPM"><Module>
<Name>MDX2JSON</Name>
<Version>3.2.45</Version>
<Version>3.2.46</Version>
<Description>RESTful web api for MDX to JSON transformation (plus JSONP and XML/A) for InterSystems IRIS. Also provides information about DeepSee objects.</Description>
<Packaging>module</Packaging>
<SourcesRoot>./</SourcesRoot>
Expand Down
Loading