[Box Backup-commit] COMMIT r2834 - box/trunk/bin/bbackupquery

[subversion at boxbackup.org]

Author: chris
Date: 2011-01-08 22:14:24 +0000 (Sat, 08 Jan 2011)
New Revision: 2834

Modified:
   box/trunk/bin/bbackupquery/BackupQueries.cpp
Log:
Fix reported store file name and reported side of local missing files.
(merges [2740] from 0.11)


Modified: box/trunk/bin/bbackupquery/BackupQueries.cpp
===================================================================
--- box/trunk/bin/bbackupquery/BackupQueries.cpp	2011-01-08 22:08:53 UTC (rev 2833)
+++ box/trunk/bin/bbackupquery/BackupQueries.cpp	2011-01-08 22:14:24 UTC (rev 2834)
@@ -2273,7 +2273,7 @@
 		for(std::set<std::pair<std::string, BackupStoreDirectory::Entry *> >::const_iterator i = storeDirs.begin(); i != storeDirs.end(); ++i)
 		{
 			std::string localPath(MakeFullPath(rLocalDir, i->first));
-			std::string storePath(rLocalDir + "/" + i->first);
+			std::string storePath(rStoreDir + "/" + i->first);
 
 			// Does the directory exist locally?
 			string_set_iter_t local(localDirs.find(i->first));
@@ -2286,8 +2286,8 @@
 			else if(local == localDirs.end())
 			{
 				// Not found -- report
-				rParams.NotifyRemoteFileMissing(localPath,
-					storePath, false);
+				rParams.NotifyLocalFileMissing(localPath,
+					storePath);
 			}
 			else if(rParams.IsExcludedDir(localPath))
 			{
@@ -2297,8 +2297,7 @@
 			{
 				// Compare directory
 				Compare(i->second->GetObjectID(),
-					rStoreDir + "/" + i->first,
-					localPath, rParams);
+					storePath, localPath, rParams);
 				
 				// Remove from set so that we know it's been compared
 				localDirs.erase(local);