From 865595c74485819e2fb87d00a0e53810c2fe3fcc Mon Sep 17 00:00:00 2001
From: Chris Frey <cdfrey@foursquare.net>
Date: Tue, 31 Jan 2012 21:37:27 -0500
Subject: [PATCH] tools: added some optional bools in btarcmp's App for future
 functionality

---
 tools/btarcmp.cc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/btarcmp.cc b/tools/btarcmp.cc
index ade461d5..8c9e8863 100644
--- a/tools/btarcmp.cc
+++ b/tools/btarcmp.cc
@@ -341,6 +341,10 @@ private:
 					// 3 - a record was added or deleted
 	bool m_verbose;
 	bool m_always_hex;
+	bool m_sort_on_load;		// if true, sort each database by
+					// Unique ID after loading from tarball
+	bool m_include_ids;		// if true, include DBData IDs in SHA1
+
 	std::string m_last_dbname;
 
 public:
@@ -407,6 +411,8 @@ App::App()
 	: m_main_return(0)
 	, m_verbose(false)
 	, m_always_hex(false)
+	, m_sort_on_load(true)
+	, m_include_ids(true)
 {
 }
 
@@ -466,7 +472,8 @@ void App::LoadTarballs()
 			b != m_tars[i].end();
 			++b )
 		{
-			sort(b->second.begin(), b->second.end(), DBDataCmp);
+			if( m_sort_on_load )
+				sort(b->second.begin(), b->second.end(), DBDataCmp);
 		}
 	}
 }
@@ -565,8 +572,8 @@ void App::Compare(const DBData &one, const DBData &two)
 
 	// always compare the sums of the data first, and if match, done
 	string sum1, sum2;
-	ChecksumDBData(one, true, sum1);
-	ChecksumDBData(two, true, sum2);
+	ChecksumDBData(one, m_include_ids, sum1);
+	ChecksumDBData(two, m_include_ids, sum2);
 	if( sum1 == sum2 )
 		return; // done
 
-- 
2.11.4.GIT