[mapguide-commits] r8828 - sandbox/jng/clean_json/Web/src/HttpHandler

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-11-11 06:25:02 -0800 (Wed, 11 Nov 2015)
New Revision: 8828

Modified:
   sandbox/jng/clean_json/Web/src/HttpHandler/XmlJsonConvert.cpp
Log:
De-arrayify element nodes when CLEAN=1 and output format is JSON

Modified: sandbox/jng/clean_json/Web/src/HttpHandler/XmlJsonConvert.cpp
===================================================================
--- sandbox/jng/clean_json/Web/src/HttpHandler/XmlJsonConvert.cpp	2015-11-11 13:59:25 UTC (rev 8827)
+++ sandbox/jng/clean_json/Web/src/HttpHandler/XmlJsonConvert.cpp	2015-11-11 14:25:02 UTC (rev 8828)
@@ -249,13 +249,22 @@
         }
     }
 
-    m_jsonDoc.BeginArray(1, nodeName);
-    m_jsonDoc.BeginArrayObject(0);
+    if (bClean)
     {
+        m_jsonDoc.BeginObject(nodeName);
         this->XmlToJsonNode(node, bClean);
+        m_jsonDoc.EndObject();
     }
-    m_jsonDoc.EndArrayObject();
-    m_jsonDoc.EndArray();
+    else
+    {
+        m_jsonDoc.BeginArray(1, nodeName);
+        m_jsonDoc.BeginArrayObject(0);
+        {
+            this->XmlToJsonNode(node, bClean);
+        }
+        m_jsonDoc.EndArrayObject();
+        m_jsonDoc.EndArray();
+    }
 }
 
 void MgXmlJsonConvert::ProcessArrayNode(int index, DOMNode *node, bool bClean)