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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-11-11 07:24:38 -0800 (Wed, 11 Nov 2015)
New Revision: 8830

Modified:
   sandbox/jng/clean_json/Web/src/HttpHandler/JsonDoc.cpp
   sandbox/jng/clean_json/Web/src/HttpHandler/JsonDoc.h
   sandbox/jng/clean_json/Web/src/HttpHandler/XmlJsonConvert.cpp
Log:
Downgrade to INT32. None of the XML schema elements should exceed the precision of an INT32

Modified: sandbox/jng/clean_json/Web/src/HttpHandler/JsonDoc.cpp
===================================================================
--- sandbox/jng/clean_json/Web/src/HttpHandler/JsonDoc.cpp	2015-11-11 15:13:21 UTC (rev 8829)
+++ sandbox/jng/clean_json/Web/src/HttpHandler/JsonDoc.cpp	2015-11-11 15:24:38 UTC (rev 8830)
@@ -124,13 +124,13 @@
     node->Element[name] = value;
 }
 
-void MgJsonDoc::Add(const char * name, INT64 value)
+void MgJsonDoc::Add(const char * name, INT32 value)
 {
     MgJsonNode *node = m_tree.top();
     node->Element[StaticString(name)] = (Json::Value::Int)value;
 }
 
-void MgJsonDoc::Add(const string & name, INT64 value)
+void MgJsonDoc::Add(const string & name, INT32 value)
 {
     MgJsonNode *node = m_tree.top();
     node->Element[name] = (Json::Value::Int)value;

Modified: sandbox/jng/clean_json/Web/src/HttpHandler/JsonDoc.h
===================================================================
--- sandbox/jng/clean_json/Web/src/HttpHandler/JsonDoc.h	2015-11-11 15:13:21 UTC (rev 8829)
+++ sandbox/jng/clean_json/Web/src/HttpHandler/JsonDoc.h	2015-11-11 15:24:38 UTC (rev 8830)
@@ -79,8 +79,8 @@
     void Add(const string &name, bool value);
     void Add(const char* name, double value);
     void Add(const string &name, double value);
-    void Add(const char* name, INT64 value);
-    void Add(const string &name, INT64 value);
+    void Add(const char* name, INT32 value);
+    void Add(const string &name, INT32 value);
     void AddAttribute(const char *name, const char *value);
     void AddAttribute(const char *name, const string &value);
     void AddAttribute(const string &name, const char *value);

Modified: sandbox/jng/clean_json/Web/src/HttpHandler/XmlJsonConvert.cpp
===================================================================
--- sandbox/jng/clean_json/Web/src/HttpHandler/XmlJsonConvert.cpp	2015-11-11 15:13:21 UTC (rev 8829)
+++ sandbox/jng/clean_json/Web/src/HttpHandler/XmlJsonConvert.cpp	2015-11-11 15:24:38 UTC (rev 8830)
@@ -211,8 +211,8 @@
                     break;
                 case XML_DATA_TYPE_NUM_INT:
                     {
-                        INT64 l = MgUtil::StringToInt64(wTextContent);
-                        m_jsonDoc.Add(nodeName, l);
+                        INT32 i = MgUtil::StringToInt32(wTextContent);
+                        m_jsonDoc.Add(nodeName, i);
                     }
                     break;
                 case XML_DATA_TYPE_NUM_DOUBLE:
@@ -277,8 +277,8 @@
                                     break;
                                 case XML_DATA_TYPE_NUM_INT:
                                     {
-                                        INT64 l = MgUtil::StringToInt64(wTextContent);
-                                        m_jsonDoc.Add(nodeName, l);
+                                        INT32 i = MgUtil::StringToInt32(wTextContent);
+                                        m_jsonDoc.Add(nodeName, i);
                                     }
                                     break;
                                 case XML_DATA_TYPE_NUM_DOUBLE: