X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=fileoutput.cpp;h=0d78a2db778b22ec0313d56781de192d56f64693;hb=96b36196d49a3d1f6bc49a26a9d2aa2da7ff876e;hp=cd3a1c74084de46dd7f5c7805d3425f0d0dd3ecb;hpb=5b9b3e01150055e3b4bb1a911ea4c61d0b755e89;p=mothur.git diff --git a/fileoutput.cpp b/fileoutput.cpp index cd3a1c7..0d78a2d 100644 --- a/fileoutput.cpp +++ b/fileoutput.cpp @@ -81,6 +81,8 @@ void ThreeColumnFile::resetFile(){ remove(inName.c_str()); renameOk = rename(outName.c_str(), inName.c_str()); + //renameFile(outName, inName); + //checks to make sure user was able to rename and remove successfully if ((renameOk != 0)) { mothurOut("Unable to rename " + outName); mothurOutEndLine(); @@ -183,6 +185,8 @@ void ColumnFile::resetFile(){ remove(inName.c_str()); renameOk = rename(outName.c_str(), inName.c_str()); + //renameFile(outName, inName); + //checks to make sure user was able to rename and remove successfully if ((renameOk != 0)) { mothurOut("Unable to rename " + outName); mothurOutEndLine(); @@ -265,9 +269,12 @@ void SharedThreeColumnFile::resetFile(){ outFile.close(); } counter = 1; + remove(inName.c_str()); renameOk = rename(outName.c_str(), inName.c_str()); + //renameFile(outName, inName); + //checks to make sure user was able to rename and remove successfully if ((renameOk != 0)) { mothurOut("Unable to rename " + outName); mothurOutEndLine(); @@ -345,19 +352,22 @@ void OneColumnFile::resetFile(){ if(counter != 0){ outFile.close(); inFile.close(); - } - else{ + }else{ outFile.close(); } counter = 1; + remove(inName.c_str()); renameOk = rename(outName.c_str(), inName.c_str()); + //renameFile(outName, inName); + //checks to make sure user was able to rename and remove successfully if ((renameOk != 0)) { mothurOut("Unable to rename " + outName); mothurOutEndLine(); perror(" : "); } + } catch(exception& e) { errorOut(e, "OneColumnFile", "resetFile"); @@ -445,9 +455,10 @@ void SharedOneColumnFile::resetFile(){ counter = 1; remove(inName.c_str()); - renameOk = rename(outName.c_str(), inName.c_str()); + //renameFile(outName, inName); + //checks to make sure user was able to rename and remove successfully if ((renameOk != 0)) { mothurOut("Unable to rename " + outName); mothurOutEndLine();