Index: TECH/JSON/ParserIntersystemsVersion.cls.xml
===================================================================
diff -u -r3764 -r3765
--- TECH/JSON/ParserIntersystemsVersion.cls.xml	(.../ParserIntersystemsVersion.cls.xml)	(revision 3764)
+++ TECH/JSON/ParserIntersystemsVersion.cls.xml	(.../ParserIntersystemsVersion.cls.xml)	(revision 3765)
@@ -397,7 +397,7 @@
 
 		// add class name to model
 		Write !,"klassenaam:'",tClass,"'"
-		Set JsonStringOutput =  JsonStringOutput_"klassenaam:'"_tClass_"'"
+		Set JsonStringOutput =  JsonStringOutput_"""klassenaam"":"""_tClass_""""
 
 		// cycle detection
 		#; use class meta-data and
@@ -437,7 +437,7 @@
 					Set tPropCount = tPropCount + 1
 					
 					Write !,?(pLevel*3),tPropName,":"
-					Set JsonStringOutput =  JsonStringOutput_" "_tPropName_":"
+					Set JsonStringOutput =  JsonStringOutput_" """_tPropName_""":"
 					Set tValue = $zobjproperty(pObject,tPropName)
 				}
 
@@ -498,7 +498,7 @@
 							}
 							Set tValue = tArray.GetAt(tKey)
 							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")_"""")_":"
+							Set JsonStringOutput =  JsonStringOutput_""""_$S($zname(tKey):tKey,$IsValidNum(tKey):tKey,1:""""_$ZCVT(tKey,"O","JS")_"""")_""":"
 
 							If (tClientType = "HANDLE") {
 								// object
@@ -586,222 +586,6 @@
 	Quit tSC
 ]]></Implementation>
 </Method>
-
-<Method name="ObjectToJSONWithQuotedProps">
-<ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[pObject:%RegisteredObject,&pVisited,pLevel:%Integer=0,*JsonStringOutput:%String=""]]></FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	#dim Json As %String = ""
-	Set tSC = $$$OK
-	Try {
-		If ((pObject="")||'$IsObject(pObject)||($D(pVisited(pObject)))) {
-			// cycle
-			Write "null"
-			Set JsonStringOutput =  JsonStringOutput_"null"
-			Quit
-		}
-		Set pVisited(pObject) = ""
-		Set tClass = $zobjclass(pObject)
-		If (tClass = "%ZEN.proxyObject") {
-			Set tSC = pObject.%ToJSON()
-			Quit
-		}
-
-		Write !,?(pLevel*3),"{"
-		Set JsonStringOutput =  JsonStringOutput_" { "
-
-		// add class name to model
-		Write !,"klassenaam:'",tClass,"'"
-		Set JsonStringOutput =  JsonStringOutput_"""klassenaam"":"""_tClass_""""
-
-		// cycle detection
-		#; use class meta-data and
-		#; loop over properties
-		Set tPropCount = 1
-		Set tPropName = $$$comMemberNext(tClass,$$$cCLASSproperty,"")
-		While (tPropName '= "") {
-			Set tPrivate = +$$$comMemberKeyGet(tClass,$$$cCLASSproperty,tPropName,$$$cPROPprivate)
-			If ('tPrivate && (tPropName'["%")) {
-				Set tType = $$$comMemberKeyGet(tClass,$$$cCLASSproperty,tPropName,$$$cPROPtype)
-				Set tClsType = $$$getClassType(tType)
-				Set tClientType = $$$comClassKeyGet(tType,$$$cCLASSclientdatatype)
-				Set tCollection = $$$comMemberKeyGet(tClass,$$$cCLASSproperty,tPropName,$$$cPROPcollection)
-				If (tClsType '= "datatype") {
-					If ($zobjclassmethod(tType,"%IsA","%Collection.AbstractList")) {
-						Set tCollection = "list"
-					}
-				}
-				Set tMultiDim = 0
-				If (tCollection="array") {
-					Set tCardinality = $$$comMemberKeyGet(tClass,$$$cCLASSproperty,tPropName,$$$cPROPcardinality)
-					Set tInverse = $$$comMemberKeyGet(tClass,$$$cCLASSproperty,tPropName,$$$cPROPinverse)
-					If ((tCardinality'="")&&(tInverse'="")) {
-						// treat relationship as list
-						Set tCollection = "list"
-					}
-				}
-				ElseIf (tCollection = "") {
-					Set tMultiDim = +$$$comMemberKeyGet(tClass,$$$cCLASSproperty,tPropName,$$$cPROPmultidimensional)
-				}
-
-				If ('tMultiDim) {
-					Write:tPropCount>0 ","
-					If tPropCount>0 {
-						Set JsonStringOutput =  JsonStringOutput_","
-					}
-					Set tPropCount = tPropCount + 1
-					
-					Write !,?(pLevel*3),tPropName,":"
-					Set JsonStringOutput =  JsonStringOutput_" """_tPropName_""":"
-					Set tValue = $zobjproperty(pObject,tPropName)
-				}
-
-				If (tMultiDim) {
-				}
-				ElseIf (tCollection="list") {
-					// list collection
-					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 ","
-							If n>1 {
-								Set JsonStringOutput =  JsonStringOutput_","
-							}
-							If (tClientType = "HANDLE") {
-								// object
-								If $IsObject(tValue) {
-									Set tSC = ..ObjectToJSONWithQuotedProps(tValue,.pVisited, pLevel + 1, .Json)
-									If $$$ISERR(tSC) {
-										Do ##class(Tools.Wlip).%New(43).String("handle error top")
-										Quit
-									} Else {
-										Set JsonStringOutput =  JsonStringOutput_Json
-									}
-									Set Json = ""
-								}
-								Else {
-									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")_""""))
-								Set JsonStringOutput =  JsonStringOutput_$Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_""""))
-							}
-						}
-					}
-					Write "]"
-					Set JsonStringOutput =  JsonStringOutput_"]"
-				}
-				ElseIf (tCollection="array") {
-					// array collection (object on client)
-					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 ","
-							If n>1 {
-								Set JsonStringOutput =  JsonStringOutput_","
-							}
-							Set tValue = tArray.GetAt(tKey)
-							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") {
-								// object
-								If $IsObject(tValue) {
-									Set tSC = ..ObjectToJSONWithQuotedProps(tValue,.pVisited, pLevel + 1, .Json)
-									If $$$ISERR(tSC) {
-										Do ##class(Tools.Wlip).%New(43).String("handle error")
-										Quit
-									} Else {
-										Set JsonStringOutput =  JsonStringOutput_Json
-									}
-									Set Json = ""
-								}
-								Else {
-									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")_""""))
-								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 "}"
-					Set JsonStringOutput =  JsonStringOutput_"}"
-				}
-				ElseIf (tClientType = "HANDLE") {
-					// object
-					If $IsObject(tValue) {
-						Set tSC = ..ObjectToJSONWithQuotedProps(tValue,.pVisited, pLevel + 1,.Json)
-						If $$$ISERR(tSC) {
-							Quit
-						} Else {
-							Set JsonStringOutput =  JsonStringOutput_Json
-						}
-						Set Json = ""
-					}
-					Else {
-						Write "null"
-						Set JsonStringOutput =  JsonStringOutput_"null"
-					}
-				}
-				ElseIf (tClientType = "CHARACTERSTREAM") {
-					If $IsObject(tValue) {
-						// turn on io escaping
-						Write """"
-						Set JsonStringOutput =  JsonStringOutput_""""
-						Set io = $$$GETIO
-						$$$SETIO("JSML")
-						Do tValue.Rewind()
-						Do tValue.OutputToDevice()
-						$$$SETIO(io)
-						Write """"
-						Set JsonStringOutput =  JsonStringOutput_""""
-					}
-					Else {
-						Write "null"
-						Set JsonStringOutput =  JsonStringOutput_"null"
-					}
-				}
-				ElseIf (tClientType = "BINARYSTREAM") {
-					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")_""""))
-					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),"}"
-		Set JsonStringOutput =  JsonStringOutput_"}"
-	}
-	Catch(ex) {
-		Set tSC = ex.AsStatus()
-		Write "null"
-		Set JsonStringOutput =  ""
-	}
-	Quit tSC
-]]></Implementation>
-</Method>
 </Class>