BugID: 1000

Update to protocol change.

MAC/APL/TestCtlr/src/ControllerMenu.cc

@@ -463,7 +463,7 @@ GCFEvent::TResult ControllerMenu::finish_state(GCFEvent& event, GCFPortInterface
 			// Start ChildControl task
 			cout << "Telling controller we are FINISHED ..." << endl;;
 			string		cntlrName = controllerName(itsCntlrType, 0, itsObsNr);
-			if (!itsChildControl->requestState(CTState::FINISHED, cntlrName, itsObsNr, itsCntlrType)) {
+			if (!itsChildControl->requestState(CTState::QUITED, cntlrName, itsObsNr, itsCntlrType)) {
 				cout << "Error during state request, bailing out" << endl;
 				stop();
 			}
@@ -475,16 +475,15 @@ GCFEvent::TResult ControllerMenu::finish_state(GCFEvent& event, GCFPortInterface
 	case F_DISCONNECTED:
 		break;
 
-	case CONTROL_FINISH: {
-			CONTROLFinishEvent msg(event);
-			cout << endl << "Finish result = " << msg.result << endl;
+	case CONTROL_QUITED: {
+			CONTROLQuitedEvent msg(event);
 			if (msg.result != CT_RESULT_NO_ERROR) {
-				cout << "Bailing out because of the errors." << endl;
-				stop ();
+				cout << endl << "WARNING: Finish result = " << msg.result << endl;
 			}
 			else {
-				_doActionMenu();
+				cout << endl << "Finish result = " << msg.result << endl;
 			}
+			_doActionMenu();
 		}
 		break;
 

MAC/APL/TestCtlr/src/TestController.cc

@@ -200,19 +200,19 @@ GCFEvent::TResult TestController::active_state(GCFEvent& event, GCFPortInterface
 			answer.result = 0;
 			LOG_DEBUG_STR("Sending RELEASED event");
 			itsParentPort->send(answer);
-			LOG_DEBUG_STR("Will send FINISH event over 6 seconds");
-			itsState      = CTState::FINISH;
+			LOG_DEBUG_STR("Will send QUITED event over 6 seconds");
+			itsState      = CTState::QUIT;
 			itsTimerPort->setTimer(6.0);
 		}
 		break;
 
-		case CTState::FINISH: {
-			CONTROLFinishEvent	msg;
+		case CTState::QUIT: {
+			CONTROLQuitedEvent	msg;
 			msg.cntlrName = itsController;
 			msg.treeID    = 7;
 			msg.errorMsg  = "Normal Termination";
 			msg.result    = 0;
-			LOG_DEBUG_STR("Sending FINISH event");
+			LOG_DEBUG_STR("Sending QUITED event");
 			itsParentPort->send(msg);
 		}
 		break;
@@ -286,19 +286,11 @@ GCFEvent::TResult TestController::active_state(GCFEvent& event, GCFPortInterface
 	case CONTROL_QUIT: {
 		CONTROLQuitEvent		msg(event);
 		itsController = msg.cntlrName;
-		itsState      = CTState::FINISH;
+		itsState      = CTState::QUIT;
 		itsTimerPort->setTimer(5.0);
 	}
 	break;
 		
-	case CONTROL_FINISHED: {
-		CONTROLFinishedEvent		msg(event);
-		LOG_DEBUG_STR("About to quit");
-		sleep(2);
-		stop();
-	}
-	break;
-
 	default:
 		LOG_DEBUG("active_state, default");
 		break;