[Igarden-commit] Garden/source/SourceMaterialDB Material.h, 1.22, 1.22.2.1 Material.cpp, 1.43, 1.43.2.1

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

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

Modified Files:
      Tag: Release_branch_v1
	Material.h Material.cpp 
Log Message:
Improve performance of startup by only merging source material when changed.

Index: Material.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Material.cpp,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -C2 -d -r1.43 -r1.43.2.1
*** Material.cpp	21 Jun 2006 12:19:31 -0000	1.43
--- Material.cpp	12 Dec 2006 00:54:39 -0000	1.43.2.1
***************
*** 1397,1401 ****
  ///		ParseXML
  //
! void Material::ParseXML(XGXMLObject *obj )
  {
  	XGXMLData		*dataObj;
--- 1397,1401 ----
  ///		ParseXML
  //
! void Material::ParseXML(XGXMLObject *obj, xmlReadContext_t &context )
  {
  	XGXMLData		*dataObj;
***************
*** 1410,1414 ****
      //  <Variant UID="0000B7B8-0000-3BEE-0000-001800006C45" variantName="Yellow" FlwrColor="yellow"/>
      // </Material>
! 	_species->ParseObjectXML(obj, true);
  		
  	subObj = dataObj->GetChild();
--- 1410,1414 ----
      //  <Variant UID="0000B7B8-0000-3BEE-0000-001800006C45" variantName="Yellow" FlwrColor="yellow"/>
      // </Material>
! 	_species->ParseObjectXML(obj, true, context);
  		
  	subObj = dataObj->GetChild();
***************
*** 1421,1425 ****
  		_variant = new Variant(GetFile(), uid);
  		_variant->SetParent(this);
! 		_variant->ParseXML(subObj);
  		if(LookupVariant(uid) == NULL)
  		{
--- 1421,1425 ----
  		_variant = new Variant(GetFile(), uid);
  		_variant->SetParent(this);
! 		_variant->ParseXML(subObj, context);
  		if(LookupVariant(uid) == NULL)
  		{
***************
*** 1532,1538 ****
  ///		ParseObjectXML
  //
! void Material::ParseObjectXML(XGXMLObject *obj, bool useAttributes)
  {
! 	_species->ParseObjectXML(obj, useAttributes);
  }
  
--- 1532,1538 ----
  ///		ParseObjectXML
  //
! void Material::ParseObjectXML(XGXMLObject *obj, bool useAttributes, xmlReadContext_t context )
  {
! 	_species->ParseObjectXML(obj, useAttributes, context );
  }
  

Index: Material.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Material.h,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** Material.h	7 Jun 2006 23:00:48 -0000	1.22
--- Material.h	12 Dec 2006 00:54:39 -0000	1.22.2.1
***************
*** 126,130 ****
  		landscapeHeight_t	GetOriginalHeight();
  		planLength_t		GetOriginalSpread();
! 		virtual void		ParseXML(XGXMLObject *obj );
  		virtual void		SaveAsXML(RGXMLWriter &writer);
  		void				SetVariant(Variant *var) { _variant = var; }
--- 126,130 ----
  		landscapeHeight_t	GetOriginalHeight();
  		planLength_t		GetOriginalSpread();
! 		virtual void		ParseXML(XGXMLObject *obj, xmlReadContext_t &context );
  		virtual void		SaveAsXML(RGXMLWriter &writer);
  		void				SetVariant(Variant *var) { _variant = var; }
***************
*** 139,143 ****
  		virtual bool		GetFlexCount(propertyID_t propertyID, FlexCount &count);
  		virtual void		SetFlexCount(propertyID_t propertyID, FlexCount &count);
! 		virtual void		ParseObjectXML(XGXMLObject *obj, bool useAttributes);
  		virtual void		SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes);
  		virtual bool		GetValueInt32Range(propertyID_t propertyID, Int32& lowerLimit, Int32& upperLimit);
--- 139,143 ----
  		virtual bool		GetFlexCount(propertyID_t propertyID, FlexCount &count);
  		virtual void		SetFlexCount(propertyID_t propertyID, FlexCount &count);
! 		virtual void		ParseObjectXML(XGXMLObject *obj, bool useAttributes, xmlReadContext_t context );
  		virtual void		SaveObjectAsXML(RGXMLWriter &writer, bool useAttributes);
  		virtual bool		GetValueInt32Range(propertyID_t propertyID, Int32& lowerLimit, Int32& upperLimit);
***************
*** 172,176 ****
  
  		virtual bool		CanAttributesBeMerged(XGXMLObject *obj) {return  _species->CanAttributesBeMerged(obj); }
! 		virtual void		MergeAttributesFrom(XGXMLObject *obj, mergeType_t mergeType) { _species->MergeAttributesFrom(obj, mergeType); }
  protected:
  		
--- 172,177 ----
  
  		virtual bool		CanAttributesBeMerged(XGXMLObject *obj) {return  _species->CanAttributesBeMerged(obj); }
! 		virtual void		MergeAttributesFrom(XGXMLObject *obj, RGDateTime &fileDate, mergeType_t mergeType) { _species->MergeAttributesFrom(obj, fileDate, mergeType); }
! 		virtual bool		GetLatestDatedReference(propertyID_t propertyID, RGDateTime& date) { return _species->GetLatestDatedReference(propertyID, date); }
  protected: