Index: TECH/JSON/ParserIntersystemsVersion.cls.xml =================================================================== diff -u -r3765 -r3870 --- TECH/JSON/ParserIntersystemsVersion.cls.xml (.../ParserIntersystemsVersion.cls.xml) (revision 3765) +++ TECH/JSON/ParserIntersystemsVersion.cls.xml (.../ParserIntersystemsVersion.cls.xml) (revision 3870) @@ -381,7 +381,7 @@ Try { If ((pObject="")||'$IsObject(pObject)||($D(pVisited(pObject)))) { // cycle - Write "null" + ;Write "null" Set JsonStringOutput = JsonStringOutput_"null" Quit } @@ -392,11 +392,11 @@ Quit } - Write !,?(pLevel*3),"{" + ;Write !,?(pLevel*3),"{" Set JsonStringOutput = JsonStringOutput_" { " // add class name to model - Write !,"klassenaam:'",tClass,"'" + ;Write !,"klassenaam:'",tClass,"'" Set JsonStringOutput = JsonStringOutput_"""klassenaam"":"""_tClass_"""" // cycle detection @@ -430,13 +430,13 @@ } If ('tMultiDim) { - Write:tPropCount>0 "," + ;Write:tPropCount>0 "," If tPropCount>0 { Set JsonStringOutput = JsonStringOutput_"," } Set tPropCount = tPropCount + 1 - Write !,?(pLevel*3),tPropName,":" + ;Write !,?(pLevel*3),tPropName,":" Set JsonStringOutput = JsonStringOutput_" """_tPropName_""":" Set tValue = $zobjproperty(pObject,tPropName) } @@ -445,14 +445,14 @@ } ElseIf (tCollection="list") { // list collection - Write "[" + ;Write "[" Set JsonStringOutput = JsonStringOutput_"[" If $IsObject(tValue) { Set tList = tValue Set tCount = tList.Count() For n = 1:1:tCount { Set tValue = tList.GetAt(n) - Write:n>1 "," + ;Write:n>1 "," If n>1 { Set JsonStringOutput = JsonStringOutput_"," } @@ -469,35 +469,35 @@ Set Json = "" } Else { - Write "null" + ;Write "null" Set JsonStringOutput = JsonStringOutput_"null" } } Else { - Write $Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_"""")) + ;Write $Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_"""")) Set JsonStringOutput = JsonStringOutput_$Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_"""")) } } } - Write "]" + ;Write "]" Set JsonStringOutput = JsonStringOutput_"]" } ElseIf (tCollection="array") { // array collection (object on client) - Write "{" + ;Write "{" Set JsonStringOutput = JsonStringOutput_"{" If $IsObject(tValue) { Set tArray = tValue Set n = 0 Set tKey = tArray.Next("") While (tKey '= "") { Set n = n + 1 - Write:n>1 "," + ;Write:n>1 "," If n>1 { Set JsonStringOutput = JsonStringOutput_"," } Set tValue = tArray.GetAt(tKey) - Write $S($zname(tKey):tKey,$IsValidNum(tKey):tKey,1:""""_$ZCVT(tKey,"O","JS")_""""),":" + ;Write $S($zname(tKey):tKey,$IsValidNum(tKey):tKey,1:""""_$ZCVT(tKey,"O","JS")_""""),":" Set JsonStringOutput = JsonStringOutput_""""_$S($zname(tKey):tKey,$IsValidNum(tKey):tKey,1:""""_$ZCVT(tKey,"O","JS")_"""")_""":" If (tClientType = "HANDLE") { @@ -513,19 +513,19 @@ Set Json = "" } Else { - Write "null" + ;Write "null" Set JsonStringOutput = JsonStringOutput_"null" } } Else { - Write $Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_"""")) + ;Write $Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_"""")) Set JsonStringOutput = JsonStringOutput_$Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_"""")) } Set tKey = tArray.Next(tKey) } } - Write "}" + ;Write "}" Set JsonStringOutput = JsonStringOutput_"}" } ElseIf (tClientType = "HANDLE") { @@ -540,47 +540,47 @@ Set Json = "" } Else { - Write "null" + ;Write "null" Set JsonStringOutput = JsonStringOutput_"null" } } ElseIf (tClientType = "CHARACTERSTREAM") { If $IsObject(tValue) { // turn on io escaping - Write """" + ;Write """" Set JsonStringOutput = JsonStringOutput_"""" Set io = $$$GETIO $$$SETIO("JSML") Do tValue.Rewind() Do tValue.OutputToDevice() $$$SETIO(io) - Write """" + ;Write """" Set JsonStringOutput = JsonStringOutput_"""" } Else { - Write "null" + ;Write "null" Set JsonStringOutput = JsonStringOutput_"null" } } ElseIf (tClientType = "BINARYSTREAM") { - Write "null" + ;Write "null" Set JsonStringOutput = JsonStringOutput_"null" } Else { - Write $Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_"""")) + ;Write $Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_"""")) Set JsonStringOutput = JsonStringOutput_$Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_"""")) } } Set tPropName = $$$comMemberNext(tClass,$$$cCLASSproperty,tPropName) } If $$$ISERR(tSC) Quit - Write !,?(pLevel*3),"}" + ;Write !,?(pLevel*3),"}" Set JsonStringOutput = JsonStringOutput_"}" } Catch(ex) { Set tSC = ex.AsStatus() - Write "null" + ;Write "null" Set JsonStringOutput = "" } Quit tSC