diff eventLogger.mm @ 32:ab7c86d0f3d8

V0.3 SZBeta sent out. bristol tests.

--- a/eventLogger.mm	Fri Mar 01 13:28:45 2013 +0000
+++ b/eventLogger.mm	Fri Mar 08 14:54:55 2013 +0000
@@ -10,6 +10,7 @@
 #include "eventLogger.h"
 
 EventLogger eventLogger;
+extern PresetManager presetManager;
 
 //---------------------------------------------------------------------------
 EventLogger::EventLogger(){
@@ -209,7 +210,7 @@
 //-----------------------------
 void EventLogger::eventlogOK(){
     // IF UPLAODING FROM IPAD TO XCODE
-    //theEvents.clear();
+    theEvents.clear();
     cout << "EVENT LOG UPLOAD SUCCESS\n";
     nextUploadNumber++;
     logUploadInProgress = false;
@@ -221,17 +222,19 @@
 }
 //-----------------------------
 void EventLogger::questionnaireNotOK(){
+    cout << "XXXXX questionnaire  NOT OK XXXXXXX \n";
     questionnaireUploaded = false;
 }
 //-----------------------------
 void EventLogger::eventlogNotOK(){
     // try later
+    cout << "XXXXX event log  NOT OK XXXXXXX \n";
     nextUploadQty += UPLOAD_CHUNK_SIZE;
     logUploadInProgress = false;
 }
 //-----------------------------
 void EventLogger::testConnectionNotOK(){
-    cout << "^^^^^^^^ server connection NOT OK ^^^^^^^^ \n";
+    cout << "XXXXX server connection NOT OK XXXXXXX \n";
     serverConnectionOK = false;
     // alert?
     
@@ -254,7 +257,7 @@
             
             // if success - clear memory
             // IF UPLAODING FROM IPAD TO XCODE COMMENT OUT
-            //theEvents.clear();
+            theEvents.clear();
             cout << "UPLOAD SUCCESS\n";
             nextUploadNumber++;
         }
@@ -267,12 +270,14 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//void EventLogger::deleteLogFile(){
-
 
 //---------------------------------------------------------------------------
 // only called when doing supervised tests
 void EventLogger::newUser(){
+    // store old stuff
+    
+    saveSessionToFile();
+    presetManager.saveSessionToFile(userName);
     cout<<"setup new user\n";
     deleteLogs();
     nextUploadNumber = 0;
@@ -486,3 +491,15 @@
     cout << questionnaireToJson() << "\n";
 };
 //---------------------------------------------------------------------------
+
+void EventLogger::saveSessionToFile(){
+    string fname = ofxiPhoneGetDocumentsDirectory() + userName + '_' + EVENT_LOG_FILENAME;
+    
+    // write to file
+    // json without the logs that were uploaded!
+    Json::Value jlogs = logsToJson();
+    ofFile logFile(fname,ofFile::WriteOnly);
+    logFile << jlogs;
+    logFile.close();
+
+}