[Igarden-commit] Garden/source/SourceMaterialDB Material.cpp, 1.43.2.1, 1.43.2.2

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

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

Modified Files:
      Tag: Release_branch_v1
	Material.cpp 
Log Message:
Fix SourceMaterialFile date handling

Index: Material.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Material.cpp,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -C2 -d -r1.43.2.1 -r1.43.2.2
*** Material.cpp	12 Dec 2006 00:54:39 -0000	1.43.2.1
--- Material.cpp	29 Dec 2006 04:23:45 -0000	1.43.2.2
***************
*** 280,284 ****
  	RGDateTime			date;
  	
! 	_species->GetIndexedDatedReference(kFieldSuppliers, index, id, date);
  	sourceDB = SourceMaterialFile::GetSourceDatabase();
  	supplier = sourceDB->LookupSupplier(id);
--- 280,287 ----
  	RGDateTime			date;
  	
! 	if(_variant != NULL && !_variant->isEmpty(kFieldSuppliers))
! 		_variant->GetIndexedDatedReference(kFieldSuppliers, index, id, date);
! 	else
! 		_species->GetIndexedDatedReference(kFieldSuppliers, index, id, date);
  	sourceDB = SourceMaterialFile::GetSourceDatabase();
  	supplier = sourceDB->LookupSupplier(id);
***************
*** 975,982 ****
  	Variant		*var;
  	const char	*namePtr;
  	long		numVariants;
  	
  	PRECONDITION(this != NULL);
! 	if((GetMaterialType() & kMajorMaterialType) != kMaterialTypePlant)
  		pref = kPreferCommon;
  	switch(pref)
--- 978,992 ----
  	Variant		*var;
  	const char	*namePtr;
+ 	materialType_t	materialType;
  	long		numVariants;
  	
  	PRECONDITION(this != NULL);
! 	materialType = GetMaterialType();
! 	if(materialType == 0)
! 	{
! 		if(GetCanonicalName().Length() == 0)
! 			pref = kPreferCommon;
! 	}
! 	else if((materialType & kMajorMaterialType) != kMaterialTypePlant)
  		pref = kPreferCommon;
  	switch(pref)