[Igarden-commit] Garden/source/Document CDatabasePanel.cpp, 1.4.2.22, 1.4.2.23

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

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

Modified Files:
      Tag: Release_branch_v1
	CDatabasePanel.cpp 
Log Message:
If we had both canonical & common, re-search for a match.  IF filling in a common to match the canonical (or vice versa), don't re-search.

Index: CDatabasePanel.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/CDatabasePanel.cpp,v
retrieving revision 1.4.2.22
retrieving revision 1.4.2.23
diff -C2 -d -r1.4.2.22 -r1.4.2.23
*** CDatabasePanel.cpp	30 Mar 2008 22:00:41 -0000	1.4.2.22
--- CDatabasePanel.cpp	5 Apr 2008 23:08:39 -0000	1.4.2.23
***************
*** 2680,2684 ****
  				else if(mat->GetFullCanonicalName() == testStr)
  					doNameLookup = false;		// name hasn't changed
! 				else if(!mat->GetCommonName().empty())
  				{
  					mat->SetCanonicalName(testStr);
--- 2680,2684 ----
  				else if(mat->GetFullCanonicalName() == testStr)
  					doNameLookup = false;		// name hasn't changed
! 				else if(!mat->GetCommonName().empty() && mat->GetCanonicalName().empty())
  				{
  					mat->SetCanonicalName(testStr);
***************
*** 2725,2729 ****
  					doNameLookup = false;		// name hasn't changed
  				}
! 				else if(!mat->GetCanonicalName().empty())
  				{
  					mat->SetCommonName(testStr);
--- 2725,2729 ----
  					doNameLookup = false;		// name hasn't changed
  				}
! 				else if(!mat->GetCanonicalName().empty() && mat->GetCommonName().empty())
  				{
  					mat->SetCommonName(testStr);