comparison eventLogger.h @ 29:fabb3a5cdfc9

Timed session improvements. Desperate pathetic attempts to send a simple HTTP POST.

 #include <map>
 #include "2dvector.h"
 #include "json.h"
 #include "testApp.h"
 
-
-
-
+#import "ServerComms.h"
+ 
 #define EVENT_THIN_FACTOR 10
 #define EVENT_LOG_FILENAME "log.json"
-#define SERVER_URL "http://127.0.0.1:8080/testservice/"
-#define UPLOAD_CHUNK_SIZE 500
+//#define LOGGING_SERVER_URL "http://www.isophonics.net/datacollector/"
+#define LOGGING_SERVER_URL "http://127.0.0.1:8080/testservice/"
+#define UPLOAD_CHUNK_SIZE 100
+
 #define QUESTIONNAIRE_ENABLE_TIME 100000 // milliseconds
-#define APP_CREATION_TIME 381429000000   // milliseconds to the time i wrote this wee blighter 
-
-#define PROGRAM_VERSION 1.0 // IMPORTANT TOCHNAGE!
+#define APP_CREATION_TIME 381429000000   // milliseconds to the time i wrote this wee blighter saves digits
+
+#define PROGRAM_VERSION 0.1 // IMPORTANT TOCHNAGE!
 
 // can add but don't change ordering - this will invalidate logs
 enum leventType {SAVE_PRESET,  // 0
     SAVE_DESET,           // 1
     SCROLL,               // 2

     os << e.eventType << ',' << e.val1 << ',' << e.val2 << ',' << e.sliderID << '\n';
     
     return os;
 }
  //---------------------------------------------------------------------------   
-
+    
+    class ThreadedObject: ofThread{
+        int i;
+        int threadedFunc(int i){
+            return i + 10;
+        };
+    };
+    
+    
 class EventLogger{
 public:
     int nextUploadNumber;
     bool loggingEnabled;
     bool logUploadInProgress;
     bool serverConnectionOK;
     bool consentGiven;
-    unsigned int deviceID; // unique get something from hardware??
+    bool questionnaireCompleted;
+    bool questionnaireUploaded;
+    unsigned int deviceID;
     unsigned int totalInteractionTime, savedInteractionTime, sessionTime, sessionStartTime;
     string userName; // not unique
 
     EventLogger();
     void init();

     void newUser();
     void logEvent(const leventType& evtType,const TwoVector& centre = TwoVector(), const double& scale = 1.0, const int& sliderID = -1, const double& sliderVal = 0.0);
     void questionnaireAnswersObtained(vector<int> answers, const char* userComments);
     void urlResponse(ofHttpResponse & response);
 private:
-    // what we need...
-    /*
-     time, type, value
-     */
 
     int currentHTTPRequestID;
+    
+    
     vector<lEvent> theEvents;
-    
+
     void thinnedLogEvent(lEvent nextEvent);
-    
-    // values applicable to all events
-
     unsigned int nextUploadQty;
 
     string questionnaireComments;
     
     ofxiPhoneDeviceType iOSdeviceType;
     
     bool testConnection();
     vector<int> questionnaireAnswers;
-    bool questionnaireCompleted;
-    bool questionnaireUploaded;
     int interfaceOrder;
 
     
     void checkLogFile();
+    void deleteLogs(); // new user
     bool uploadEventLog(bool async);
     void firstEverAppOpen();
     void readJsonToLog(const string &jsonFile);
     void uploadQuestionnaire();
     bool sendToServer(string functionName, Json::Value jsonData, bool async);

         for(evIter = theEvents.begin(); evIter < theEvents.end(); evIter++){
             cout << *evIter;
             
         }
     };
+    
+    //
+    ServerComms *serverComms;
+    
 };
 
 
     //---------------------------------------------------------------------------