[Igarden-commit] Garden/source/Plugins AppCallbackInterface.cpp, 1.10, 1.10.2.1

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

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

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

Index: AppCallbackInterface.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Plugins/AppCallbackInterface.cpp,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** AppCallbackInterface.cpp	8 Feb 2006 01:47:15 -0000	1.10
--- AppCallbackInterface.cpp	19 Dec 2006 12:53:07 -0000	1.10.2.1
***************
*** 125,129 ****
  	XGXMLObject			*parseTree;
  	SourceMaterialFile	*sources = SourceMaterialFile::GetSourceDatabase();
! 	
  	XGXMLDOMParser parser;
  	stream->SetFilePos(0);
--- 125,132 ----
  	XGXMLObject			*parseTree;
  	SourceMaterialFile	*sources = SourceMaterialFile::GetSourceDatabase();
! 	RGDateTime			currentDate;
! 				
! 	currentDate.Now();
! 				
  	XGXMLDOMParser parser;
  	stream->SetFilePos(0);
***************
*** 142,146 ****
  	while(parseTree != NULL)
  	{
! 		sources->ImportSupplierFromXMLObject(parseTree, kMergeNonSearch);
  		parseTree = parseTree->GetSibling();
  	}
--- 145,149 ----
  	while(parseTree != NULL)
  	{
! 		sources->ImportSupplierFromXMLObject(parseTree, kMergeNonSearch, currentDate);
  		parseTree = parseTree->GetSibling();
  	}
***************
*** 152,155 ****
--- 155,161 ----
  	XGXMLObject			*parseTree;
  	SourceMaterialFile	*sources = SourceMaterialFile::GetSourceDatabase();
+ 	RGDateTime			currentDate;
+ 				
+ 	currentDate.Now();
  	
  	XGXMLDOMParser parser;
***************
*** 169,173 ****
  	while(parseTree != NULL)
  	{
! 		sources->ImportMaterialFromXMLObject(parseTree, kMergeNonSearch);
  		parseTree = parseTree->GetSibling();
  	}
--- 175,179 ----
  	while(parseTree != NULL)
  	{
! 		sources->ImportMaterialFromXMLObject(parseTree, kMergeNonSearch, currentDate);
  		parseTree = parseTree->GetSibling();
  	}