done testing 1.13.0

[mothur.git] / getlabelcommand.cpp

diff --git a/getlabelcommand.cpp b/getlabelcommand.cpp
index be2a989d7a953be7b68a29ceca1a88c4d514bd20..971feb4b33f70f44bcfbabdf6de55caf17bda3cd 100644 (file)
--- a/getlabelcommand.cpp
+++ b/getlabelcommand.cpp
@@ -11,7 +11,7 @@
 
 //**********************************************************************************************************************
 
-GetlabelCommand::GetlabelCommand(string option){
+GetlabelCommand::GetlabelCommand(string option)  {
        try {
                globaldata = GlobalData::getInstance();
                abort = false;
@@ -20,14 +20,12 @@ GetlabelCommand::GetlabelCommand(string option){
                if(option == "help") { help(); abort = true; }
                
                else {
-                       if (option != "") { mothurOut("There are no valid parameters for the get.label command."); mothurOutEndLine(); abort = true; }
-                       
-                       if ((globaldata->getListFile() == "") && (globaldata->getRabundFile() == "") && (globaldata->getSabundFile() == "")) { mothurOut("You must read a list, sabund or rabund before you can use the get.label command."); mothurOutEndLine(); abort = true; }                               
+                       if ((globaldata->getListFile() == "") && (globaldata->getRabundFile() == "") && (globaldata->getSabundFile() == "")) { m->mothurOut("You must read a list, sabund or rabund before you can use the get.label command."); m->mothurOutEndLine(); abort = true; }                         
                }
 
        }
        catch(exception& e) {
-               errorOut(e, "GetlabelCommand", "GetlabelCommand");
+               m->errorOut(e, "GetlabelCommand", "GetlabelCommand");
                exit(1);
        }
 }
@@ -35,14 +33,14 @@ GetlabelCommand::GetlabelCommand(string option){
 
 void GetlabelCommand::help(){
        try {
-               mothurOut("The get.label command can only be executed after a successful read.otu command.\n");
-               mothurOut("You may not use any parameters with the get.label command.\n");
-               mothurOut("The get.label command should be in the following format: \n");
-               mothurOut("get.label()\n");
-               mothurOut("Example get.label().\n");
+               m->mothurOut("The get.label command can only be executed after a successful read.otu command.\n");
+               m->mothurOut("You may not use any parameters with the get.label command.\n");
+               m->mothurOut("The get.label command should be in the following format: \n");
+               m->mothurOut("get.label()\n");
+               m->mothurOut("Example get.label().\n");
        }
        catch(exception& e) {
-               errorOut(e, "GetlabelCommand", "help");
+               m->errorOut(e, "GetlabelCommand", "help");
                exit(1);
        }
 }
@@ -61,15 +59,18 @@ int GetlabelCommand::execute(){
                
                filename = globaldata->inputFileName;
                ifstream in;
-               openInputFile(filename, in);
+               m->openInputFile(filename, in);
                string label;
                int numBins = 0;
                int count = -1;
                while(in.good()) {
+                       
+                       if (m->control_pressed) { in.close();  return 0; }
+                       
                        if(count > numBins)
                                count = 0;
                        if(count == 0) {
-                               mothurOut(label); mothurOutEndLine();
+                               m->mothurOut(label); m->mothurOutEndLine();
                                in >> numBins;
                        }
                        in >> label;
@@ -81,7 +82,7 @@ int GetlabelCommand::execute(){
        }
 
        catch(exception& e) {
-               errorOut(e, "GetlabelCommand", "execute");
+               m->errorOut(e, "GetlabelCommand", "execute");
                exit(1);
        }
 }