[Igarden-commit] Garden/source/SourceMaterialDB SourceMaterialFile.cpp, 1.22.2.2, 1.22.2.3 SourceMaterialFile.h, 1.9.2.1, 1.9.2.2

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/SourceMaterialDB
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4135

Modified Files:
      Tag: Release_branch_v1
	SourceMaterialFile.cpp SourceMaterialFile.h 
Log Message:
Re-enable plant picture display (was disabled by speed improvements to SourceMaterialFile)

Index: SourceMaterialFile.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/SourceMaterialFile.h,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** SourceMaterialFile.h	12 Dec 2006 00:56:09 -0000	1.9.2.1
--- SourceMaterialFile.h	19 Dec 2006 12:52:23 -0000	1.9.2.2
***************
*** 55,61 ****
  		InfoSupplier*		CreateInfoSupplier(const XGUUID& id);
  		c4_Storage*			GetStorage();
! 		ErrorCode			ImportFromXML(XGFileSpecifier &spec);
! 		void				ImportMaterialFromXMLObject(XGXMLObject *sub2, mergeType_t mergeType);
! 		void				ImportSupplierFromXMLObject(XGXMLObject *sub2, mergeType_t mergeType);
  		ErrorCode			ExportToXML(XGFileSpecifier &spec);
  		static SourceMaterialFile* GetSourceDatabase();
--- 55,61 ----
  		InfoSupplier*		CreateInfoSupplier(const XGUUID& id);
  		c4_Storage*			GetStorage();
! 		ErrorCode			ImportFromXML(XGFileSpecifier &spec, RGDateTime &xmlModDate);
! 		void				ImportMaterialFromXMLObject(XGXMLObject *sub2, mergeType_t mergeType, RGDateTime &xmlModDate);
! 		void				ImportSupplierFromXMLObject(XGXMLObject *sub2, mergeType_t mergeType, RGDateTime &xmlModDate);
  		ErrorCode			ExportToXML(XGFileSpecifier &spec);
  		static SourceMaterialFile* GetSourceDatabase();

Index: SourceMaterialFile.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/SourceMaterialFile.cpp,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -C2 -d -r1.22.2.2 -r1.22.2.3
*** SourceMaterialFile.cpp	12 Dec 2006 00:55:54 -0000	1.22.2.2
--- SourceMaterialFile.cpp	19 Dec 2006 12:52:23 -0000	1.22.2.3
***************
*** 79,83 ****
  #endif
  
! 			ec = gSourceDB->ImportFromXML(spec);
  			if(ec != KYAAFNoError)
  				(void)Caution(ec, sourceStartFile);
--- 79,83 ----
  #endif
  
! 			ec = gSourceDB->ImportFromXML(spec, _fileModDate);
  			if(ec != KYAAFNoError)
  				(void)Caution(ec, sourceStartFile);
***************
*** 458,462 ****
  }
  
! ErrorCode SourceMaterialFile::ImportFromXML(XGFileSpecifier &spec)
  {
  	XGFile			inFile;
--- 458,462 ----
  }
  
! ErrorCode SourceMaterialFile::ImportFromXML(XGFileSpecifier &spec, RGDateTime &xmlModDate)
  {
  	XGFile			inFile;
***************
*** 499,503 ****
  							while(sub2 != NULL)
  							{
! 								ImportMaterialFromXMLObject(sub2, kMergeNonSearch);
  								
  								sub2 = sub2->GetSibling();
--- 499,503 ----
  							while(sub2 != NULL)
  							{
! 								ImportMaterialFromXMLObject(sub2, kMergeNonSearch, xmlModDate);
  								
  								sub2 = sub2->GetSibling();
***************
*** 511,515 ****
  							while(sub4 != NULL)
  							{		
! 								ImportSupplierFromXMLObject(sub4, kMergeStd);
  
  								sub4 = sub4->GetSibling();
--- 511,515 ----
  							while(sub4 != NULL)
  							{		
! 								ImportSupplierFromXMLObject(sub4, kMergeStd, xmlModDate);
  
  								sub4 = sub4->GetSibling();
***************
*** 548,552 ****
  }
  
! void SourceMaterialFile::ImportSupplierFromXMLObject(XGXMLObject *sub4, mergeType_t mergeType)
  {
  	XGXMLData		*data;
--- 548,552 ----
  }
  
! void SourceMaterialFile::ImportSupplierFromXMLObject(XGXMLObject *sub4, mergeType_t mergeType, RGDateTime &xmlModDate)
  {
  	XGXMLData		*data;
***************
*** 556,560 ****
  	xmlReadContext_t context;
  
! 	context.modDate = _fileModDate;
  	data = dynamic_cast<XGXMLData*>(sub4);
  	val = data->GetArgValue("UID");
--- 556,560 ----
  	xmlReadContext_t context;
  
! 	context.modDate = xmlModDate;
  	data = dynamic_cast<XGXMLData*>(sub4);
  	val = data->GetArgValue("UID");
***************
*** 569,573 ****
  }
  
! void SourceMaterialFile::ImportMaterialFromXMLObject(XGXMLObject *sub2, mergeType_t mergeType)
  {
  	const char		*val;
--- 569,573 ----
  }
  
! void SourceMaterialFile::ImportMaterialFromXMLObject(XGXMLObject *sub2, mergeType_t mergeType, RGDateTime &xmlModDate)
  {
  	const char		*val;
***************
*** 585,599 ****
  	data2 = dynamic_cast<XGXMLData*>(sub2);
  
! 	context.modDate = _fileModDate;
  	mat = FindMaterialFromXMLNames(sub2, false);
  	if(mat != NULL)
  	{
  		refFound = mat->GetLatestDatedReference(kFieldSuppliers, date);
! 		if(!refFound || date.GetDouble() < _fileModDate.GetDouble())
  		{
  #if TEST_LOAD_BEHAVIOR
  			String	fileDateStr, objDateStr;
  			
! 			_fileModDate.LongDateStr(shortDate, fileDateStr);
  			date.LongDateStr(shortDate, objDateStr);
  
--- 585,599 ----
  	data2 = dynamic_cast<XGXMLData*>(sub2);
  
! 	context.modDate = xmlModDate;
  	mat = FindMaterialFromXMLNames(sub2, false);
  	if(mat != NULL)
  	{
  		refFound = mat->GetLatestDatedReference(kFieldSuppliers, date);
! 		if(!refFound || date.GetDouble() < xmlModDate.GetDouble())
  		{
  #if TEST_LOAD_BEHAVIOR
  			String	fileDateStr, objDateStr;
  			
! 			xmlModDate.LongDateStr(shortDate, fileDateStr);
  			date.LongDateStr(shortDate, objDateStr);
  
***************
*** 626,630 ****
  			if(mat->CanAttributesBeMerged(sub2))
  			{
! 				mat->GetSpeciesObj()->MergeAttributesFrom(sub2, _fileModDate, mergeType);
  				
  				done = true;
--- 626,630 ----
  			if(mat->CanAttributesBeMerged(sub2))
  			{
! 				mat->GetSpeciesObj()->MergeAttributesFrom(sub2, xmlModDate, mergeType);
  				
  				done = true;
***************
*** 645,649 ****
  		InfoSupplier	*sup;
  		XGUUID			uid;
! 		GardenDate		lastModDate(_fileModDate);
  		
  		mat = new Material(this);
--- 645,649 ----
  		InfoSupplier	*sup;
  		XGUUID			uid;
! 		GardenDate		lastModDate(xmlModDate);
  		
  		mat = new Material(this);
***************
*** 692,701 ****
  			{
  				variant->GetLatestDatedReference(kFieldSuppliers, date);
! 				if(date.GetDouble() < _fileModDate.GetDouble())
  				{
  #if TEST_LOAD_BEHAVIOR
  					String	fileDateStr, objDateStr;
  					
! 					_fileModDate.LongDateStr(shortDate, fileDateStr);
  					date.LongDateStr(shortDate, objDateStr);
  					
--- 692,701 ----
  			{
  				variant->GetLatestDatedReference(kFieldSuppliers, date);
! 				if(date.GetDouble() < xmlModDate.GetDouble())
  				{
  #if TEST_LOAD_BEHAVIOR
  					String	fileDateStr, objDateStr;
  					
! 					xmlModDate.LongDateStr(shortDate, fileDateStr);
  					date.LongDateStr(shortDate, objDateStr);
  					
***************
*** 707,711 ****
  					if(variant->CanAttributesBeMerged(sub3))
  					{
! 						variant->MergeAttributesFrom(sub3, _fileModDate, mergeType);
  						done = true;
  					}
--- 707,711 ----
  					if(variant->CanAttributesBeMerged(sub3))
  					{
! 						variant->MergeAttributesFrom(sub3, xmlModDate, mergeType);
  						done = true;
  					}