Changeset 308

Timestamp:

07/07/09 16:35:40 (15 years ago)

Author:

wrodgers

Message:

slight modification to SML

Files:

• vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp (modified) (12 diffs)

vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp

@@ -178 +178 @@
     char* cols[] = {(char *)"ID_Num", (char *)"Service_Name"};
 
-    // create table
 
     // copy tablename
     strcpy(_services_DB->tablename, "Services");
+
+    //If program execution ends in anything other than a ordered shutdown, DB's will still be there for next run
+    //Need to get rid of it so that old data isn't inadvertantly used in the next execution cycle
     sprintf(_services_DB->command, "DROP TABLE IF EXISTS Services;");     
 
@@ -482 +484 @@
         FD_SET(shellSocketFD, &sockSet);
         selTimeout.tv_sec = 0;
-        selTimeout.tv_usec = 50000;
+        selTimeout.tv_usec = 5000;
         //Check if there is a message on the shell ready to be processed
         rc=select(shellSocketFD + 1, &sockSet, NULL, NULL, &selTimeout);
@@ -521 +523 @@
         FD_SET(shellSocketFD, &sockSet);
         selTimeout.tv_sec = 0;
-        selTimeout.tv_usec = 50000;
+        selTimeout.tv_usec = 5000;
         //Check if there is a message on the shell ready to be processed
         rc=select(shellSocketFD + 1, &sockSet, NULL, NULL, &selTimeout);
@@ -672 +674 @@
                     data.append((const char*) sqlite3_column_text(pStatement, 1)); 
                 else {
-                    //TODO could do shell output here if not in DB
                 data.append("1@output1@");
                 data.append(miss[activeMission].services[sourceID].output[0]);
@@ -832 +833 @@
 ServiceManagementLayer::PerformActiveMission()
 {
-    printf("start PAM\n");
+    //printf("start PAM\n");
     uint16_t i = 0;
     std::string data_param, data_obsv, data;
@@ -897 +898 @@
 
     //Receive any other defined inputs
-    while(i < 10 && !miss[activeMission].input[i].empty()){
+    /*while(i < 10 && !miss[activeMission].input[i].empty()){
             //New data being added to DB
         //printf("inserting data from shell\n");
@@ -932 +933 @@
         i++;
         data.clear();
-    }
+    }*/
 
 
@@ -998 +999 @@
             }
             //printf("L0:--- %s  %s---\n", miss[activeMission].services[i].output[t].c_str(), token);
-            //TODO change to strstr
-
             bool doit = false;
             if(miss[activeMission].services[i].output[t].find(">") != string::npos){
@@ -1348 +1347 @@
                     }
                     data.clear();
-                    //printf("L0:while detected %d, %d\n", k, miss[activeMission].services[i].num_conds);
                     input.clear();
                     check.clear();
@@ -1375 +1373 @@
                             }
                             sqlite3_finalize(pStatement);
-                            //printf("data=%s\n", data.c_str());
                             token = strtok((char *)data.c_str(), "@");
                             token = strtok(NULL, "@");
                             token = strtok(NULL, "@");
-                            //printf("data=%s\n", token);
                             break;
                         }
@@ -1399 +1395 @@
             TransactData(i);}
         i++;
-        //printf("i=%d\n", i);
     }
     i=0;
@@ -1442 +1437 @@
         data.clear();
     }
+
+
+    LOG("ServiceManagementLayer:: Done performing active mission.\n");
     /*LOG("ServiceManagementLayer:: Done sending output data to shell from PerformActiveMission.\n");
     strcpy(_data_DB->command, "select ");