[GME-commit] GMESRC/GME/Core CoreAttribute.cpp,1.18,1.19

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/Core
In directory braindrain:/tmp/cvs-serv1115

Modified Files:
	CoreAttribute.cpp 
Log Message:
no message

CVS User: bogyom

Index: CoreAttribute.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreAttribute.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CoreAttribute.cpp	13 Oct 2004 15:17:54 -0000	1.18
--- CoreAttribute.cpp	29 Oct 2004 17:35:28 -0000	1.19
***************
*** 1437,1441 ****
  			if( !IsLoaded() )
  				GetLockAttr()->Load();
! 		}
  		else
  		{
--- 1437,1459 ----
  			if( !IsLoaded() )
  				GetLockAttr()->Load();
! 
!             // BGY: this hack makes sure that the sourcecontrol status is always
!             // read from the storage.
!             if( GetValType() == VALTYPE_STRING )
!             {
!                 ICoreStorage *storage = SetStorageThisAttribute();
! 		        ASSERT( storage != NULL );
! 		        COMTHROW( storage->LockObject() );
! 		        CComVariant v;
!                 COMTHROW( storage->get_AttributeValue(&v) );
!                 std::string str;
!                 CopyTo(v,str);
!                 if( strncmp( str.c_str(), "GME_SourceControl_State", 23 ) == 0 )
!                 {
! 		            COMTHROW( storage->get_AttributeValue(p) );
!                     return S_OK;
!                 }
!             }
!         }
  		else
  		{