[GME-commit] GMESRC/GME/Mga MgaProject.cpp,1.65,1.66

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

Update of /project/gme-repository/GMESRC/GME/Mga
In directory escher:/tmp/cvs-serv5370

Modified Files:
	MgaProject.cpp 
Log Message:
OpenEx needs to upgrade as well, because we assign guids to newchildren.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MgaProject.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaProject.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** MgaProject.cpp	19 May 2006 18:35:31 -0000	1.65
--- MgaProject.cpp	19 May 2006 20:12:07 -0000	1.66
***************
*** 171,175 ****
  			// Set generic for meta
  		CComPtr<ICoreMetaProject> genericproject;
! 		CreateCoreMetaProject(genericproject, mgaversion > 1);
  
  		CComVariant connGUID;
--- 171,175 ----
  			// Set generic for meta
  		CComPtr<ICoreMetaProject> genericproject;
! 		CreateCoreMetaProject(genericproject, mgaversion > 1); // create version 2 from now on
  
  		CComVariant connGUID;
***************
*** 240,259 ****
  	COMTRY {
  		if(opened != CLOSED) COMTHROW(E_MGA_PROJECT_OPEN);
- 
- 		// ask project info
- 		long mga_ver( 0);
- 		{
- 			CComBSTR par_nm;     // not used now
- 			CComBSTR par_vs;     // not used now
- 			CComVariant par_gd;  // not used now
- 			VARIANT_BOOL ro_mode;// not used now 
- 			COMTHROW(this->QueryProjectInfo( projectname, &mga_ver, &par_nm, &par_vs, &par_gd, &ro_mode));
- 		}
- 
  		CComBSTR s;
  		CComVariant pGUID;
  		CComBSTR ver;
  		CComPtr<ICoreMetaProject> genericproject;
! 		CreateCoreMetaProject(genericproject, mga_ver > 1); // different than Open: if in old format it won't update
  		VARIANT_BOOL ro;
  
--- 240,248 ----
  	COMTRY {
  		if(opened != CLOSED) COMTHROW(E_MGA_PROJECT_OPEN);
  		CComBSTR s;
  		CComVariant pGUID;
  		CComBSTR ver;
  		CComPtr<ICoreMetaProject> genericproject;
! 		CreateCoreMetaProject(genericproject, true); // will upgrade if old version
  		VARIANT_BOOL ro;
  
***************
*** 375,379 ****
  		CComBSTR ver;
  		CComPtr<ICoreMetaProject> genericproject;
! 		CreateCoreMetaProject(genericproject, true); // mgaversion = 2 model created by default
  
  		COMTHROW(dataproject->OpenProject(projectname, genericproject, ro_mode));
--- 364,368 ----
  		CComBSTR ver;
  		CComPtr<ICoreMetaProject> genericproject;
! 		CreateCoreMetaProject(genericproject, true); // will upgrade if old version
  
  		COMTHROW(dataproject->OpenProject(projectname, genericproject, ro_mode));