diff ServerComms.mm @ 31:23ef179c3748

Ben / Christian 0.2

--- a/ServerComms.mm	Wed Feb 27 11:39:07 2013 +0000
+++ b/ServerComms.mm	Fri Mar 01 13:28:45 2013 +0000
@@ -13,7 +13,13 @@
 
 @implementation ServerComms
 //
-
+-(id)init{
+    self = [super init];
+    if(self != nil){
+        self.requestInProgress = NO;
+    }
+    return self;
+}
 
 //  asynchronous one
 -(BOOL)doPostRequest:(NSString *)type withData:(NSString *)data{
@@ -25,7 +31,7 @@
     NSString *localServerURL = @"http://127.0.0.1:8080/testservice/";
     NSString *webServerURL = @"http://www.isophonics.net/datacollector/";
 
-    NSString *urls = [webServerURL stringByAppendingString:type];
+    NSString *urls = [localServerURL stringByAppendingString:type];
     NSURL *url = [NSURL URLWithString:urls];
 
 
@@ -59,7 +65,7 @@
     NSString *localServerURL = @"http://127.0.0.1:8080/testservice/";
     NSString *webServerURL = @"http://www.isophonics.net/datacollector/";
     
-    NSString *urls = [webServerURL stringByAppendingString:type];
+    NSString *urls = [localServerURL stringByAppendingString:type];
     NSURL *url = [NSURL URLWithString:urls];
     
     
@@ -102,6 +108,9 @@
         success = true;
     }else{
         success = false;
+        if([type isEqualToString:@"testConnection"]) eventLogger.testConnectionNotOK();
+        if([type isEqualToString:@"eventlog"]) eventLogger.eventlogNotOK();
+        if([type isEqualToString:@"questionnaire"]) eventLogger.questionnaireNotOK();
     }
     
     // else check error??
@@ -121,7 +130,7 @@
     NSString *responseDataString = [[NSString alloc] initWithData:d encoding:NSUTF8StringEncoding];
     
     //NSString* responseDataString = [NSString stringWithUTF8String: ];
-    NSLog(@"didRecieveDta %@", responseDataString);
+    NSLog(@" %@ didRecieveData %@",self.currentRequestType, responseDataString);
     [self.data appendData:d];
     
     if([responseDataString isEqualToString:@"testConnection:OK"]){
@@ -132,23 +141,28 @@
     }else    if([responseDataString isEqualToString:@"eventlog:OK"]){
         // call eventLogger eventlogUploadOK
         eventLogger.eventlogOK();
+    }else{
+        if([self.currentRequestType isEqualToString:@"testConnection"]) eventLogger.testConnectionNotOK();
+        if([self.currentRequestType isEqualToString:@"eventlog"]) eventLogger.eventlogNotOK();
+        if([self.currentRequestType isEqualToString:@"questionnaire"]) eventLogger.questionnaireNotOK();
     }
-    // or?
-    /*
-    if([self.currentRequestType isEqualToString:@"testConnection"){
-        
-    }
-     */
 }
 
 - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
-    UIAlertView * av = [ [UIAlertView alloc] initWithTitle:NSLocalizedString(@"Error", @"")
-                                 message:[error localizedDescription]
-                                delegate:nil
-                       cancelButtonTitle:NSLocalizedString(@"OK", @"")
-                       otherButtonTitles:nil ];
-    [av show];
+
     NSLog(@"fail with error");
+    if([self.currentRequestType isEqualToString:@"testConnection"]) {
+        UIAlertView * av = [ [UIAlertView alloc] initWithTitle:NSLocalizedString(@"Sorry", @"")
+                                                       message:[error localizedDescription]
+                                                      delegate:nil
+                                             cancelButtonTitle:NSLocalizedString(@"OK", @"")
+                                             otherButtonTitles:nil ];
+        [av show];
+        eventLogger.testConnectionNotOK();
+        
+    }
+    if([self.currentRequestType isEqualToString:@"eventlog"]) eventLogger.eventlogNotOK();
+    if([self.currentRequestType isEqualToString:@"questionnaire"]) eventLogger.questionnaireNotOK();
     self.requestInProgress = NO;
     // we won't know what kind of request method this was...
 }