From 0b3eec581dd61968614ff5c7b6b92fcdaf68b92f Mon Sep 17 00:00:00 2001
From: dfighter1985 <dfighter1985.arcemu@gmail.com>
Date: Mon, 16 Apr 2012 02:18:07 +0200
Subject: [PATCH] CDB no longer depends on Ryzom database banks.

--HG--
branch : cdb-refactoring
---
 code/ryzom/client/src/cdb_branch.cpp       | 18 +++++++++---------
 code/ryzom/client/src/cdb_branch.h         | 16 ++++++++++------
 code/ryzom/client/src/cdb_leaf.cpp         |  4 ----
 code/ryzom/client/src/cdb_synchronised.cpp |  4 +---
 code/ryzom/client/src/cdb_synchronised.h   |  2 +-
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/code/ryzom/client/src/cdb_branch.cpp b/code/ryzom/client/src/cdb_branch.cpp
index 52c6fe455..07cd08307 100644
--- a/code/ryzom/client/src/cdb_branch.cpp
+++ b/code/ryzom/client/src/cdb_branch.cpp
@@ -68,25 +68,25 @@ CCDBNodeBranch::CDBBranchObsInfo *CCDBNodeBranch::_NextNotifiedObs = NULL;
 uint CCDBNodeBranch::_CurrNotifiedObsList = 0;
 
 // Mapping from server database index to client database index (first-level nodes)
-vector<uint> CCDBNodeBranch::_CDBBankToUnifiedIndexMapping [NB_CDB_BANKS];
+vector<uint> CCDBNodeBranch::_CDBBankToUnifiedIndexMapping [CDB_BANKS_MAX];
 
 // Mapping from client database index to TCDBBank (first-level nodes)
-vector<TCDBBank> CCDBNodeBranch::_UnifiedIndexToBank;
+vector<uint> CCDBNodeBranch::_UnifiedIndexToBank;
 
 // Last index mapped
 uint CCDBNodeBranch::_CDBLastUnifiedIndex = 0;
 
 // Number of bits for first-level branches, by bank
-uint CCDBNodeBranch::_FirstLevelIdBitsByBank [NB_CDB_BANKS];
+uint CCDBNodeBranch::_FirstLevelIdBitsByBank [CDB_BANKS_MAX];
 
-extern const char *CDBBankNames[INVALID_CDB_BANK+1];
+extern const char *CDBBankNames[CDB_BANK_INVALID+1];
 
 std::vector< CCDBNodeBranch::IBranchObserverCallFlushObserver* > CCDBNodeBranch::flushObservers;
 
 // reset all static data
 void CCDBNodeBranch::reset()
 {
-	for ( uint b=0; b<NB_CDB_BANKS; ++b )
+	for ( uint b=0; b<CDB_BANKS_MAX; ++b )
 		_CDBBankToUnifiedIndexMapping[b].clear();
 	_UnifiedIndexToBank.clear();
 	_CDBLastUnifiedIndex = 0;
@@ -111,14 +111,14 @@ void CCDBNodeBranch::mapNodeByBank( ICDBNode * /* node */, const string& bankStr
 	}
 	else*/ // now clientOnly indices are known by the server as well
 	{
-		for ( uint b=0; b!=INVALID_CDB_BANK; ++b )
+		for ( uint b=0; b!=CDB_BANK_INVALID; ++b )
 		{
 			if ( string(CDBBankNames[b]) == bankStr )
 			{
 				//nldebug( "CDB: Mapping %s.%u to Unified.%u", CDBBankNames[b], _CDBBankToUnifiedIndexMapping[b].size(), _CDBLastUnifiedIndex );
 				_CDBBankToUnifiedIndexMapping[b].push_back( _CDBLastUnifiedIndex );
 				++_CDBLastUnifiedIndex;
-				_UnifiedIndexToBank.push_back( (TCDBBank)b );
+				_UnifiedIndexToBank.push_back( b );
 				break;
 			}
 		}
@@ -270,7 +270,7 @@ void CCDBNodeBranch::init( xmlNodePtr node, NLMISC::IProgressCallback &progressC
 		nlassertex( _UnifiedIndexToBank.size() == countNode, ("Mapped: %u Nodes: %u", _UnifiedIndexToBank.size(), countNode) );
 
 		_IdBits = 0;
-		for ( uint b=0; b!=NB_CDB_BANKS; ++b )
+		for ( uint b=0; b!=CDB_BANKS_MAX; ++b )
 		{
 			uint nbNodesOfBank = (uint)_CDBBankToUnifiedIndexMapping[b].size();
 			uint idb = 0;
@@ -459,7 +459,7 @@ bool CCDBNodeBranch::setProp( CTextId& id, sint64 value )
 /*
  * Update the database from the delta, but map the first level with the bank mapping (see _CDBBankToUnifiedIndexMapping)
  */
-void CCDBNodeBranch::readAndMapDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, TCDBBank bank )
+void CCDBNodeBranch::readAndMapDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, uint bank )
 {
 	nlassert( ! isAtomic() ); // root node mustn't be atomic
 
diff --git a/code/ryzom/client/src/cdb_branch.h b/code/ryzom/client/src/cdb_branch.h
index 3c4cb736c..9020ef0ec 100644
--- a/code/ryzom/client/src/cdb_branch.h
+++ b/code/ryzom/client/src/cdb_branch.h
@@ -20,7 +20,11 @@
 #define CDB_BRANCH_H
 
 #include "cdb.h"
-#include "game_share/ryzom_database_banks.h"
+
+enum{
+	CDB_BANKS_MAX = 3,
+	CDB_BANK_INVALID
+};
 
 /**
  * Database Node which contains a set of properties
@@ -99,7 +103,7 @@ public:
 	void write( CTextId& id, FILE * f);
 
 	/// Update the database from the delta, but map the first level with the bank mapping (see _CDBBankToUnifiedIndexMapping)
-	void readAndMapDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, TCDBBank bank );
+	void readAndMapDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, uint bank );
 
 	/// Update the database from a stream coming from the FE
 	void readDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream & f );
@@ -125,7 +129,7 @@ public:
 	void clear();
 
 	/// Reset the data corresponding to the bank (works only on top level node)
-	void resetBank( NLMISC::TGameCycle gc, TCDBBank bank)
+	void resetBank( NLMISC::TGameCycle gc, uint bank)
 	{
 		//nlassert( getParent() == NULL );
 		for ( uint i=0; i!=_Nodes.size(); ++i )
@@ -323,16 +327,16 @@ protected:
 	static CDBBranchObsInfo *_NextNotifiedObs;
 
 	/// Mapping from server database index to client database index (first-level nodes)
-	static std::vector<uint> _CDBBankToUnifiedIndexMapping [NB_CDB_BANKS];
+	static std::vector<uint> _CDBBankToUnifiedIndexMapping [CDB_BANKS_MAX];
 
 	// Mapping from client database index to TCDBBank (first-level nodes)
-	static std::vector<TCDBBank> _UnifiedIndexToBank;
+	static std::vector<uint> _UnifiedIndexToBank;
 
 	/// Last index mapped
 	static uint				_CDBLastUnifiedIndex;
 
 	/// Number of bits for first-level branches, by bank
-	static uint				_FirstLevelIdBitsByBank [NB_CDB_BANKS];
+	static uint				_FirstLevelIdBitsByBank [CDB_BANKS_MAX];
 
 	/// called by clear
 	void			removeAllBranchObserver();
diff --git a/code/ryzom/client/src/cdb_leaf.cpp b/code/ryzom/client/src/cdb_leaf.cpp
index 9b3d26c89..7111e81bc 100644
--- a/code/ryzom/client/src/cdb_leaf.cpp
+++ b/code/ryzom/client/src/cdb_leaf.cpp
@@ -16,9 +16,6 @@
 
 
 
-#include "stdpch.h"
-
-
 //#define TRACE_READ_DELTA
 //#define TRACE_WRITE_DELTA
 //#define TRACE_SET_VALUE
@@ -31,7 +28,6 @@
 #include "cdb_leaf.h"
 #include "game_share/xml_auto_ptr.h"
 //#include <iostream.h>
-#include "interface_v3/interface_manager.h"
 
 ////////////////
 // Namespaces //
diff --git a/code/ryzom/client/src/cdb_synchronised.cpp b/code/ryzom/client/src/cdb_synchronised.cpp
index 21b1f1748..d25564e70 100644
--- a/code/ryzom/client/src/cdb_synchronised.cpp
+++ b/code/ryzom/client/src/cdb_synchronised.cpp
@@ -16,8 +16,6 @@
 
 
 
-#include "stdpch.h"
-
 //#define TRACE_READ_DELTA
 //#define TRACE_WRITE_DELTA
 //#define TRACE_SET_VALUE
@@ -175,7 +173,7 @@ void CCDBSynchronised::write( const string &fileName )
 //	readDelta
 //
 //-----------------------------------------------
-void CCDBSynchronised::readDelta( NLMISC::TGameCycle gc, CBitMemStream& s, TCDBBank bank )
+void CCDBSynchronised::readDelta( NLMISC::TGameCycle gc, CBitMemStream& s, uint bank )
 {
 	nldebug("Update DB");
 
diff --git a/code/ryzom/client/src/cdb_synchronised.h b/code/ryzom/client/src/cdb_synchronised.h
index a405b39a0..c4a70dd2b 100644
--- a/code/ryzom/client/src/cdb_synchronised.h
+++ b/code/ryzom/client/src/cdb_synchronised.h
@@ -84,7 +84,7 @@ public:
 	 * Update the database from a stream coming from the FE
 	 * \param f the stream
 	 */
-	void readDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, TCDBBank bank );
+	void readDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, uint bank );
 
 	/**
 	 * Return the value of a property (the update flag is set to false)