added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / subsamplecommand.cpp

diff --git a/subsamplecommand.cpp b/subsamplecommand.cpp
index 24c83fdc2142a0ad875cba6ff49ffd3d15b73fef..c352feb099a83879bae9e1aca0f35d5bfe56e691 100644 (file)
--- a/subsamplecommand.cpp
+++ b/subsamplecommand.cpp
@@ -234,7 +234,7 @@ SubSampleCommand::SubSampleCommand(string option) {
                        }
                        
                        string temp = validParameter.validFile(parameters, "size", false);              if (temp == "not found"){       temp = "0";             }
-                       convert(temp, size);  
+                       m->mothurConvert(temp, size);  
                        
                        temp = validParameter.validFile(parameters, "persample", false);                if (temp == "not found"){       temp = "f";             }
                        persample = m->isTrue(temp);
@@ -255,6 +255,10 @@ SubSampleCommand::SubSampleCommand(string option) {
                        if ((groupfile != "") && ((fastafile != "") && (listfile != ""))) { 
                                m->mothurOut("A new group file can only be made from the subsample of a listfile or fastafile, not both. Please correct."); m->mothurOutEndLine(); abort = true; }
                        
+                       if ((fastafile != "") && (namefile == "")) {
+                               vector<string> files; files.push_back(fastafile);
+                               parser.getNameFile(files);
+                       }
                }
 
        }