Diff: src/CloudDataHandler/CloudFileReceiver.cpp

Revision:

162:5e8948b8044d

Parent:

149:950c90425f7c

Child:

171:fb29030d4eaf

Child:

173:acfb464a4aec

diff -r 9d47fe5ba805 -r 5e8948b8044d src/CloudDataHandler/CloudFileReceiver.cpp
--- a/src/CloudDataHandler/CloudFileReceiver.cpp	Fri Sep 30 14:32:26 2016 +0000
+++ b/src/CloudDataHandler/CloudFileReceiver.cpp	Fri Sep 30 20:10:50 2016 +0000
@@ -375,23 +375,26 @@
     }
     return true;
 }
+
+MbedJSONValue CloudFileReceiverFinalJson;
+MbedJSONValue CloudFileReceiveJson;
 bool CloudDataHandler_RcvFile = false;
 bool CloudFileReceiver( std::string *recv_string, mDot *dot )
 {
-    MbedJSONValue from_json;
+    
     bool status;
-    parse( from_json, recv_string->c_str() );
-    int sequence = from_json["seq"].get<int>();
+    parse( CloudFileReceiveJson, recv_string->c_str() );
+    int sequence = CloudFileReceiveJson["seq"].get<int>();
 
     CloudDataHandler_RcvFile = false;
 
     // sequence of -1 means string sent in 1 chunk.
     if( sequence == -1 ) {
-        return StoreReceivedFile( dot, from_json );
+        return StoreReceivedFile( dot, CloudFileReceiveJson );
     } else if( sequence == 0 ) {
 
         memset(CloudFileReceiverWriteBuf,0,sizeof(CloudFileReceiverWriteBuf));
-        snprintf(CloudFileReceiverWriteBuf, sizeof(CloudFileReceiverWriteBuf), "%s%s", "{\"seq\":-1, \"pay\":",from_json["pay"].get<std::string>().c_str() );
+        snprintf(CloudFileReceiverWriteBuf, sizeof(CloudFileReceiverWriteBuf), "%s%s", "{\"seq\":-1, \"pay\":",CloudFileReceiveJson["pay"].get<std::string>().c_str() );
         logInfo("(%d)Writing String Length=%d, %s", __LINE__, 1024, CloudFileReceiverWriteBuf );
 
         status = dot->saveUserFile("scratch.json", (void *)CloudFileReceiverWriteBuf, 1024);
@@ -404,8 +407,6 @@
 
     } else if( sequence == -2 ) {
 
-        MbedJSONValue final_json;
-
         logInfo("(%d)READING BACK scratch.json FILE FOR LAST PACKET", __LINE__);
 
         // read the file back
@@ -415,17 +416,17 @@
             return false;
         }
 
-        snprintf(CloudFileReceiverWriteBuf, sizeof(CloudFileReceiverWriteBuf), "%s%s%s", CloudFileReceiverReadBuf, from_json["pay"].get<std::string>().c_str(), "}" );
+        snprintf(CloudFileReceiverWriteBuf, sizeof(CloudFileReceiverWriteBuf), "%s%s%s", CloudFileReceiverReadBuf, CloudFileReceiveJson["pay"].get<std::string>().c_str(), "}" );
         logInfo("(%d)Final String Length=%d, %s", __LINE__, strlen(CloudFileReceiverWriteBuf), CloudFileReceiverWriteBuf );
 
-        parse( final_json, CloudFileReceiverWriteBuf );
+        parse( CloudFileReceiverFinalJson, CloudFileReceiverWriteBuf );
 
-        int sequence = final_json["seq"].get<int>();
-        int mType = final_json["pay"]["mtype"].get<int>();
+        int sequence = CloudFileReceiverFinalJson["seq"].get<int>();
+        int mType = CloudFileReceiverFinalJson["pay"]["mtype"].get<int>();
 
         printf("MESSAGE TYPE=%d\r\n",mType);
 
-        status = StoreReceivedFile( dot, final_json );
+        status = StoreReceivedFile( dot, CloudFileReceiverFinalJson );
         if( status != true ) {
             logError("(%d)save file failed, status=%d", __LINE__, status);
         }
@@ -448,7 +449,7 @@
             return false;
         }
 
-        snprintf(CloudFileReceiverWriteBuf, sizeof(CloudFileReceiverWriteBuf), "%s%s", CloudFileReceiverReadBuf, from_json["pay"].get<std::string>().c_str() );
+        snprintf(CloudFileReceiverWriteBuf, sizeof(CloudFileReceiverWriteBuf), "%s%s", CloudFileReceiverReadBuf, CloudFileReceiveJson["pay"].get<std::string>().c_str() );
         logInfo("(%d)Writing String Length=%d, %s", __LINE__, strlen(CloudFileReceiverWriteBuf), CloudFileReceiverWriteBuf );
 
         status = dot->saveUserFile("scratch.json", (void *)CloudFileReceiverWriteBuf, 1024);