Changeset 313
- Timestamp:
- 07/09/09 09:28:05 (15 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp
r308 r313 840 840 char buffer[256]; 841 841 char buffer1[256]; 842 char *token; 842 char *token, *token2; 843 std::string data2; 843 844 int rc; 844 845 char *errorMsg; … … 1002 1003 if(miss[activeMission].services[i].output[t].find(">") != string::npos){ 1003 1004 //printf("foundit!\n"); 1005 std::string data2; 1004 1006 strcpy(_data_DB->command, "SELECT "); 1005 1007 strcat(_data_DB->command, _data_DB->tablename); … … 1014 1016 if (rc == SQLITE_OK){ 1015 1017 if (sqlite3_step(pStatement) == SQLITE_ROW) 1016 data = (const char *) sqlite3_column_text(pStatement, 1);1018 data2 = (const char *) sqlite3_column_text(pStatement, 1); 1017 1019 else { 1018 1020 printf("1 data_DB:: Data not yet in DB.\n"); … … 1023 1025 } 1024 1026 sqlite3_finalize(pStatement); 1025 token = strtok((char *)data.c_str(), "@");1026 token = strtok(NULL, "@");1027 token = strtok(NULL, "@");1028 if(atof( buffer) > atof(token))1027 char* token2 = strtok((char *)data2.c_str(), "@"); 1028 token2 = strtok(NULL, "@"); 1029 token2 = strtok(NULL, "@"); 1030 if(atof(token) > atof(token2)) 1029 1031 doit=true; 1030 1032 //printf("%s %s\n", buffer, token); 1031 data.clear();1032 1033 } 1033 1034 else if (strstr(miss[activeMission].services[i].output[t].c_str(), token)) … … 1071 1072 token = strtok(NULL, "@"); 1072 1073 //printf("data=%s\n", token); 1073 data.clear();1074 1074 break; 1075 1075 } … … 1080 1080 //printf("here! %s\n", miss[activeMission].services[k].output[t].c_str()); 1081 1081 if(miss[activeMission].services[k].output[t].find(">") != string::npos){ 1082 std::string data2; 1082 1083 strcpy(_data_DB->command, "SELECT "); 1083 1084 strcat(_data_DB->command, _data_DB->tablename); … … 1091 1092 if (rc == SQLITE_OK){ 1092 1093 if (sqlite3_step(pStatement) == SQLITE_ROW) 1093 data = (const char *) sqlite3_column_text(pStatement, 1);1094 data2 = (const char *) sqlite3_column_text(pStatement, 1); 1094 1095 else { 1095 1096 printf("1 data_DB:: Data not yet in DB.\n"); … … 1100 1101 } 1101 1102 sqlite3_finalize(pStatement); 1102 token = strtok((char *)data.c_str(), "@"); 1103 token = strtok(NULL, "@"); 1104 token = strtok(NULL, "@"); 1105 if(atof(buffer) > atof(token)) 1103 //printf("data=%s token=%s\n", data2.c_str(), token); 1104 token2 = strtok((char *)data2.c_str(), "@"); 1105 token2 = strtok(NULL, "@"); 1106 token2 = strtok(NULL, "@"); 1107 //printf("token2 %s token %s\n", token2, token); 1108 if(atof(token) > atof(token2)) 1106 1109 doit=true; 1107 data.clear();1108 1110 } 1109 1111 else if (strstr(miss[activeMission].services[k].output[t].c_str(), token)) … … 1166 1168 if (rc == SQLITE_OK){ 1167 1169 if (sqlite3_step(pStatement) == SQLITE_ROW) 1168 data = (const char *) sqlite3_column_text(pStatement, 1);1170 data2 = (const char *) sqlite3_column_text(pStatement, 1); 1169 1171 else { 1170 1172 printf("1 data_DB:: Data not yet in DB.\n"); … … 1175 1177 } 1176 1178 sqlite3_finalize(pStatement); 1177 token = strtok((char *)data.c_str(), "@");1178 token = strtok(NULL, "@");1179 token = strtok(NULL, "@");1180 if(atof( buffer) > atof(token))1179 token2 = strtok((char *)data2.c_str(), "@"); 1180 token2 = strtok(NULL, "@"); 1181 token2 = strtok(NULL, "@"); 1182 if(atof(token) > atof(token2)) 1181 1183 doit=true; 1182 1184 data.clear();
