[GME-commit] GMESRC/GME/Parser MgaParser.cpp,1.22,1.23 MgaParser.h,1.8,1.9

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

Update of /var/lib/gme/GMESRC/GME/Parser
In directory braindrain:/tmp/cvs-serv2277

Modified Files:
	MgaParser.cpp MgaParser.h 
Log Message:
New MGA guid handling. New GUID will be assigned upon any change to the project.

CVS User: volgy

Index: MgaParser.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MgaParser.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MgaParser.cpp	19 Jul 2004 07:01:00 -0000	1.22
--- MgaParser.cpp	19 Jul 2004 08:42:19 -0000	1.23
***************
*** 222,225 ****
--- 222,227 ----
  		libstodo.clear();
  		
+ 		COMTHROW( project->put_GUID(projectguid) );
+ 
  		COMTHROW( project->CommitTransaction() );
  		COMTHROW( project->Notify(APPEVENT_XML_IMPORT_END));
***************
*** 343,347 ****
  	manual_relid_mode = false;
  	relid = -2;
! 
  };
  
--- 345,352 ----
  	manual_relid_mode = false;
  	relid = -2;
! 	
! 	GUID tmpguid;
! 	memset(&tmpguid, 0, sizeof(GUID));
! 	CopyTo(tmpguid, projectguid);
  };
  
***************
*** 547,554 ****
  			CopyTo(bstr, guid);
  
! 			CComVariant v;
! 			CopyTo(guid, v);
! 
! 			COMTHROW( project->put_GUID(v) );
  		}
  
--- 552,556 ----
  			CopyTo(bstr, guid);
  
! 			CopyTo(guid, projectguid);
  		}
  

Index: MgaParser.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MgaParser.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MgaParser.h	19 Jul 2004 07:01:00 -0000	1.8
--- MgaParser.h	19 Jul 2004 08:42:19 -0000	1.9
***************
*** 72,75 ****
--- 72,76 ----
  	typedef vector<librecord> librecords;
  	librecords libstodo;
+ 	CComVariant projectguid;
  
  // ------- Logging