X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Ftoolkit%2Fbamtools.cpp;h=29097d021bacbc9fb7a42fbf3ba773ee572a29c6;hb=bafc03f4ed7ed9ff1b3fb24874dc8a4a6d58e605;hp=4875a9a10bdb3ba1dbfdc9ac50d1f5ccfc0ebe07;hpb=8c80d760637f8df39262683cd2570f0589423d36;p=bamtools.git

diff --git a/src/toolkit/bamtools.cpp b/src/toolkit/bamtools.cpp
index 4875a9a..29097d0 100644
--- a/src/toolkit/bamtools.cpp
+++ b/src/toolkit/bamtools.cpp
@@ -1,9 +1,8 @@
 // ***************************************************************************
 // bamtools.cpp (c) 2010 Derek Barnett, Erik Garrison
 // Marth Lab, Department of Biology, Boston College
-// All rights reserved.
 // ---------------------------------------------------------------------------
-// Last modified: 21 March 2011 (DB)
+// Last modified: 12 October 2012 (DB)
 // ---------------------------------------------------------------------------
 // Integrates a number of BamTools functionalities into a single executable.
 // ***************************************************************************
@@ -16,6 +15,7 @@
 #include "bamtools_index.h"
 #include "bamtools_merge.h"
 #include "bamtools_random.h"
+#include "bamtools_resolve.h"
 #include "bamtools_revert.h"
 #include "bamtools_sort.h"
 #include "bamtools_split.h"
@@ -38,6 +38,7 @@ static const string HEADER   = "header";
 static const string INDEX    = "index";
 static const string MERGE    = "merge";
 static const string RANDOM   = "random";
+static const string RESOLVE  = "resolve";
 static const string REVERT   = "revert";
 static const string SORT     = "sort";
 static const string SPLIT    = "split";
@@ -77,6 +78,7 @@ AbstractTool* CreateTool(const string& arg) {
     if ( arg == INDEX )    return new IndexTool;
     if ( arg == MERGE )    return new MergeTool;
     if ( arg == RANDOM )   return new RandomTool;
+    if ( arg == RESOLVE )  return new ResolveTool;
     if ( arg == REVERT )   return new RevertTool;
     if ( arg == SORT )     return new SortTool;
     if ( arg == SPLIT )    return new SplitTool;
@@ -111,7 +113,8 @@ int Help(int argc, char* argv[]) {
     cerr << "\theader          Prints BAM header information" << endl;
     cerr << "\tindex           Generates index for BAM file" << endl;
     cerr << "\tmerge           Merge multiple BAM files into single file" << endl;
-    cerr << "\trandom          Select random alignments from existing BAM file(s)" << endl;
+    cerr << "\trandom          Select random alignments from existing BAM file(s), intended more as a testing tool." << endl;
+    cerr << "\tresolve         Resolves paired-end reads (marking the IsProperPair flag as needed)" << endl;
     cerr << "\trevert          Removes duplicate marks and restores original base qualities" << endl;
     cerr << "\tsort            Sorts the BAM file according to some criteria" << endl;
     cerr << "\tsplit           Splits a BAM file on user-specified property, creating a new BAM output file for each value found" << endl;
@@ -134,7 +137,7 @@ int Version(void) {
     cout << "bamtools " << versionStream.str() << endl;
     cout << "Part of BamTools API and toolkit" << endl;
     cout << "Primary authors: Derek Barnett, Erik Garrison, Michael Stromberg" << endl;
-    cout << "(c) 2009-2011 Marth Lab, Biology Dept., Boston College" << endl;
+    cout << "(c) 2009-2012 Marth Lab, Biology Dept., Boston College" << endl;
     cout << endl;
     return EXIT_SUCCESS;
 }