//**********************************************************************************************************************
MergeFileCommand::MergeFileCommand(){
try {
- //initialize outputTypes
+ abort = true; calledHelp = true;
vector<string> tempOutNames;
outputTypes["merge"] = tempOutNames;
}
MergeFileCommand::MergeFileCommand(string option) {
try {
- abort = false;
+ abort = false; calledHelp = false;
if(option == "help") {
help();
- abort = true;
+ abort = true; calledHelp = true;
}
else {
//valid paramters for this command
int MergeFileCommand::execute(){
try {
- if (abort == true) { return 0; }
+ if (abort == true) { if (calledHelp) { return 0; } return 2; }
ofstream outputFile;
m->openOutputFile(outputFileName, outputFile);