[Igarden-commit] Garden/source/Database View.cp,1.6.2.1,1.6.2.2

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

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

Modified Files:
      Tag: Release_branch_v1
	View.cp 
Log Message:
Fix problem with cached string tags on map

Index: View.cp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Database/View.cp,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** View.cp	26 Dec 2006 01:38:37 -0000	1.6.2.1
--- View.cp	5 Jan 2007 02:21:45 -0000	1.6.2.2
***************
*** 80,84 ****
  		c4_StringProp	strProp(_viewClass->FieldName(propID));
  		for(n = 0; n < count; n++)
! 			entry._strMap[strProp(view[n])] = n;
  		_stringKeys.push_back(entry);
  	}
--- 80,84 ----
  		c4_StringProp	strProp(_viewClass->FieldName(propID));
  		for(n = 0; n < count; n++)
! 			entry._strMap[String(strProp(view[n]))] = n;
  		_stringKeys.push_back(entry);
  	}
***************
*** 228,231 ****
--- 228,232 ----
  	long		result = -1, n, count;
  	stringKey_t	*keyDataPtr;
+ 	String	strObj(str);
  	
  	count = _stringKeys.Length();
***************
*** 235,241 ****
  		if(keyDataPtr->_propID == propID)
  		{
! 			std::map<const char*, int, ltstr>::iterator	cur = keyDataPtr->_strMap.find(str);
  			if(cur != keyDataPtr->_strMap.end())
  				result = (*cur).second;
  			break;
  		}
--- 236,245 ----
  		if(keyDataPtr->_propID == propID)
  		{
! 			stringMap_t::iterator	cur = keyDataPtr->_strMap.find(strObj);
  			if(cur != keyDataPtr->_strMap.end())
+ 			{
  				result = (*cur).second;
+ //				printf("GetRowForString %s = %ld\n", str, result);
+ 			}
  			break;
  		}
***************
*** 251,254 ****
--- 255,259 ----
  {
  	long	n, count;
+ 	String	strObj(str);
  	
  	count = _stringKeys.Length();
***************
*** 257,261 ****
  		if(_stringKeys[n]._propID == propID)
  		{
! 			_stringKeys[n]._strMap[str] = row;
  			break;
  		}
--- 262,267 ----
  		if(_stringKeys[n]._propID == propID)
  		{
! //			printf("AddKeyString %s = %ld\n", str, row);
! 			_stringKeys[n]._strMap[strObj] = row;
  			break;
  		}