[Gcblue-commits] gcb_wx/src/database tcDatabase.cpp, 1.35, 1.36 tcDatabaseObject.cpp, 1.22, 1.23 tcMissileDBObject.cpp, 1.23, 1.24 tcSqlReader.cpp, 1.7, 1.8

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21820/src/database

Modified Files:
	tcDatabase.cpp tcDatabaseObject.cpp tcMissileDBObject.cpp 
	tcSqlReader.cpp 
Log Message:
Update for server name change

Index: tcMissileDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcMissileDBObject.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** tcMissileDBObject.cpp	18 Jun 2006 00:45:00 -0000	1.23
--- tcMissileDBObject.cpp	17 Aug 2006 01:28:03 -0000	1.24
***************
*** 115,123 ****
  bool tcMissileDBObject::HasAllEmitters(std::vector<long>& emitters)
  {
! 	unsigned int nEmitters = emitters.size();
  
      long seekerKey = GetSensorKey();
  
! 	for (unsigned int k=0; k<nEmitters; k++)
  	{
  		long emitterId = emitters[k];
--- 115,123 ----
  bool tcMissileDBObject::HasAllEmitters(std::vector<long>& emitters)
  {
! 	size_t nEmitters = emitters.size();
  
      long seekerKey = GetSensorKey();
  
! 	for (size_t k=0; k<nEmitters; k++)
  	{
  		long emitterId = emitters[k];

Index: tcDatabaseObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabaseObject.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcDatabaseObject.cpp	18 Jun 2006 00:44:59 -0000	1.22
--- tcDatabaseObject.cpp	17 Aug 2006 01:28:03 -0000	1.23
***************
*** 219,222 ****
--- 219,227 ----
  	}
  
+ 	const char* tcDatabaseObject::GetName() const
+ 	{
+ 		return mzClass.c_str();
+ 	}
+ 
      /**
      * @return string array with parsed filenames of images for this db object
***************
*** 421,425 ****
  		strncpy(mzDescription, desc.c_str(),DESCRIPTION_STRING_LENGTH-1);
  
! 		//Load3DModel(); // do lazy load instead
  	}
  
--- 426,436 ----
  		strncpy(mzDescription, desc.c_str(),DESCRIPTION_STRING_LENGTH-1);
  
! #ifdef _DEBUG
! 		if (entry.GetStringError())
! 		{
! 			fprintf(stderr, "tcDatabaseObject::ReadSql - warning: null string occurred in entry: %s\n",
! 				mzClass.c_str());
! 		}
! #endif
  	}
  

Index: tcDatabase.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** tcDatabase.cpp	18 Jun 2006 00:44:59 -0000	1.35
--- tcDatabase.cpp	17 Aug 2006 01:28:03 -0000	1.36
***************
*** 383,389 ****
--- 383,401 ----
  void tcDatabase::SerializeSql(const std::string& suffix, bool load)
  {
+ 	if (load) // start fresh when Serialize called, unlike UpdateSql that updates
+ 	{
+ 		ClearDictionaries();
+ 		Clear();
+ 	}
+ 
      std::string path(DATABASE_PATH);
  	std::string fileName = path + string("database") + suffix + ".db";
  
+ 	if (load)
+ 	{
+ 		fprintf(stdout, "Loading default database %s (previous entries cleared)\n", 
+ 			fileName.c_str());
+ 	}
+ 
      ReadWriteSql(fileName, load);
  }
***************
*** 398,402 ****
  void tcDatabase::UpdateSql(const std::string& fileName)
  {
!     ClearDictionaries();
  
      ReadWriteSql(fileName, true); // true to load
--- 410,416 ----
  void tcDatabase::UpdateSql(const std::string& fileName)
  {
! 	fprintf(stdout, "Updating database with %s\n", 
! 		fileName.c_str());
! 
  
      ReadWriteSql(fileName, true); // true to load
***************
*** 583,587 ****
  }
  
! void tcDatabase::Clear() {
     mcObjectData.RemoveAll();
  }
--- 597,602 ----
  }
  
! void tcDatabase::Clear() 
! {
     mcObjectData.RemoveAll();
  }
***************
*** 707,715 ****
      {
          wxASSERT(false);
!         fprintf(stderr, "Error - tcDatabase::DeleteObject - Obj doesn't exist");
          return 0;
      }
  
!     std::string className(obj->GetClassName());
  
      std::map<std::string, long>::iterator mapIter = nameToKey.find(className);
--- 722,731 ----
      {
          wxASSERT(false);
!         fprintf(stderr, "Error - tcDatabase::DeleteObject - Obj doesn't exist (key %d)\n",
! 			anKey);
          return 0;
      }
  
!     std::string className(obj->GetName());
  
      std::map<std::string, long>::iterator mapIter = nameToKey.find(className);
***************
*** 982,987 ****
  	if (mapIter == nameToKey.end()) 
  	{
  		fprintf(stderr, "Error - tcDatabase::GetObject - not found in nameToKey (%s)\n",
! 			className.c_str());
  		return 0;
  	}
--- 998,1009 ----
  	if (mapIter == nameToKey.end()) 
  	{
+ 		std::string missingClass = className.c_str();
+ 		if (missingClass.size() == 0)
+ 		{
+ 			missingClass = "Empty string";
+ 		}
+ 
  		fprintf(stderr, "Error - tcDatabase::GetObject - not found in nameToKey (%s)\n",
! 			missingClass.c_str());
  		return 0;
  	}

Index: tcSqlReader.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSqlReader.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcSqlReader.cpp	23 Mar 2006 01:11:02 -0000	1.7
--- tcSqlReader.cpp	17 Aug 2006 01:28:03 -0000	1.8
***************
*** 151,156 ****
--- 151,163 ----
  
  
+ 	bool tcSqlReader::GetStringError() const
+ 	{
+ 		return data.getStringError();
+ 	}
+ 
  	unsigned int tcSqlReader::LookupFieldIndex(const std::string& field)
  	{
+ 		static std::string errorMessage;
+ 
  		std::map<std::string, unsigned int>::const_iterator mapIter;
  
***************
*** 158,162 ****
  		if (mapIter == columnLookup.end()) 
  		{
! 			throw std::invalid_argument("tcSqlReader - field not found");
  		}
  		else
--- 165,170 ----
  		if (mapIter == columnLookup.end()) 
  		{
! 			errorMessage = wxString::Format("tcSqlReader - field not found (%s)", field.c_str()).c_str();
! 			throw std::invalid_argument(errorMessage);
  		}
  		else