[GME-commit] GMESRC/GME/Mga MgaGeneric.cpp,1.10,1.11 MgaGeneric.h,1.7,1.8 MgaProject.cpp,1.50,1.51 MgaProject.h,1.23,1.24

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Mon Jul 19 03:01:03 CDT 2004 

Update of /var/lib/gme/GMESRC/GME/Mga
In directory braindrain:/tmp/cvs-serv1912/GME/Mga

Modified Files:
	MgaGeneric.cpp MgaGeneric.h MgaProject.cpp MgaProject.h 
Log Message:
Introduced version and metaversion attributes for MGA projects

CVS User: volgy

Index: MgaGeneric.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaGeneric.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MgaGeneric.cpp	14 Jan 2003 23:50:00 -0000	1.10
--- MgaGeneric.cpp	19 Jul 2004 07:01:00 -0000	1.11
***************
*** 58,65 ****
  		CREATE_ATTRIBUTE(ATTRID_CREATOR, "Author", "Created by",			VALTYPE_STRING);
  		CREATE_ATTRIBUTE(ATTRID_GUID, "GUID", "GUID",					    VALTYPE_BINARY);
  		CREATE_ATTRIBUTE(ATTRID_PARGUID, "ParadigmGUID", "Paradigm GUID",	VALTYPE_BINARY);
  		CREATE_ATTRIBUTE(ATTRID_PARADIGM, "ExtParadigm", "External Paradigm",VALTYPE_STRING);
  		CREATE_ATTRIBUTE(ATTRID_EXTDATA, "Comment", "Project Comments",			VALTYPE_STRING);
! 		CREATE_ATTRIBUTE(ATTRID_VERSION, "Version", "Version Code", VALTYPE_LONG);
  		CREATE_COLLECTION(ATTRID_PARENT, "Children", "Child Objects");
  //CONSTRAINT
--- 58,67 ----
  		CREATE_ATTRIBUTE(ATTRID_CREATOR, "Author", "Created by",			VALTYPE_STRING);
  		CREATE_ATTRIBUTE(ATTRID_GUID, "GUID", "GUID",					    VALTYPE_BINARY);
+ 		CREATE_ATTRIBUTE(ATTRID_VERSION, "Version", "Version",				VALTYPE_STRING);
  		CREATE_ATTRIBUTE(ATTRID_PARGUID, "ParadigmGUID", "Paradigm GUID",	VALTYPE_BINARY);
+ 		CREATE_ATTRIBUTE(ATTRID_PARVERSION, "ParadigmVersion", "Paradigm Version",	VALTYPE_STRING);
  		CREATE_ATTRIBUTE(ATTRID_PARADIGM, "ExtParadigm", "External Paradigm",VALTYPE_STRING);
  		CREATE_ATTRIBUTE(ATTRID_EXTDATA, "Comment", "Project Comments",			VALTYPE_STRING);
! 		CREATE_ATTRIBUTE(ATTRID_MGAVERSION, "MGA Version", "MGA Version Code", VALTYPE_LONG);
  		CREATE_COLLECTION(ATTRID_PARENT, "Children", "Child Objects");
  //CONSTRAINT

Index: MgaGeneric.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaGeneric.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MgaGeneric.h	14 Jan 2003 21:00:00 -0000	1.7
--- MgaGeneric.h	19 Jul 2004 07:01:00 -0000	1.8
***************
*** 43,47 ****
  #define ATTRID_REFASPECT				418
  
! #define ATTRID_VERSION					419
  
  #define ATTRID_ATTRPARENT				620
--- 43,47 ----
  #define ATTRID_REFASPECT				418
  
! #define ATTRID_MGAVERSION				419
  
  #define ATTRID_ATTRPARENT				620
***************
*** 60,63 ****
--- 60,65 ----
  #define	ATTRID_CREATOR					432
  #define	ATTRID_EXTDATA					433
+ #define	ATTRID_VERSION					434
+ #define	ATTRID_PARVERSION				435
  
  #define	ATTRID_CONSTROCL				450

Index: MgaProject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaProject.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** MgaProject.cpp	30 Jun 2004 17:50:47 -0000	1.50
--- MgaProject.cpp	19 Jul 2004 07:01:00 -0000	1.51
***************
*** 93,97 ****
  			dataroot[ATTRID_CDATE] = dataroot[ATTRID_MDATE]  = Now();
  			dataroot[ATTRID_PARADIGM] = paradigmname;
! 			dataroot[ATTRID_VERSION] = mgaversion;
  			dataroot[ATTRID_NAME]    = rootname;
  			if( guid.vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(guid) != sizeof(GUID) )
--- 93,97 ----
  			dataroot[ATTRID_CDATE] = dataroot[ATTRID_MDATE]  = Now();
  			dataroot[ATTRID_PARADIGM] = paradigmname;
! 			dataroot[ATTRID_MGAVERSION] = mgaversion;
  			dataroot[ATTRID_NAME]    = rootname;
  			if( guid.vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(guid) != sizeof(GUID) )
***************
*** 226,230 ****
  			COMTHROW(dataproject->get_RootObject(&dataroot.ComPtr()));
  		    s=dataroot[ATTRID_PARADIGM];
! 			mgaversion = dataroot[ATTRID_VERSION];
  
  			pGUID=CComVariant(dataroot[ATTRID_PARGUID]);
--- 226,230 ----
  			COMTHROW(dataproject->get_RootObject(&dataroot.ComPtr()));
  		    s=dataroot[ATTRID_PARADIGM];
! 			mgaversion = dataroot[ATTRID_MGAVERSION];
  
  			pGUID=CComVariant(dataroot[ATTRID_PARGUID]);
***************
*** 329,333 ****
  			COMTHROW(dataproject->get_RootObject(&dataroot.ComPtr()));
  		    s=dataroot[ATTRID_PARADIGM];
! 			mgaversion = dataroot[ATTRID_VERSION];
  
  			pGUID=CComVariant(dataroot[ATTRID_PARGUID]);
--- 329,333 ----
  			COMTHROW(dataproject->get_RootObject(&dataroot.ComPtr()));
  		    s=dataroot[ATTRID_PARADIGM];
! 			mgaversion = dataroot[ATTRID_MGAVERSION];
  
  			pGUID=CComVariant(dataroot[ATTRID_PARGUID]);
***************
*** 399,403 ****
  		    *paradigmname = CComBSTR(dataroot[ATTRID_PARADIGM]).Detach();
  		    CComVariant(dataroot[ATTRID_PARGUID]).Detach(paradigmGUID);
! 			*mgaversion = dataroot[ATTRID_VERSION];
  			dp->PopTerritory();
  		} catch(hresult_exception &) {
--- 399,403 ----
  		    *paradigmname = CComBSTR(dataroot[ATTRID_PARADIGM]).Detach();
  		    CComVariant(dataroot[ATTRID_PARGUID]).Detach(paradigmGUID);
! 			*mgaversion = dataroot[ATTRID_MGAVERSION];
  			dp->PopTerritory();
  		} catch(hresult_exception &) {
***************
*** 733,736 ****
--- 733,751 ----
  }
  
+ STDMETHODIMP CMgaProject::get_MetaVersion(BSTR *pVal)
+ {
+ 
+ 	COMTRY
+ 	{
+ 		CHECK_OUTSTRPAR(pVal);
+ 		CoreObj self;
+ 		COMTHROW(dataproject->get_RootObject(&self.ComPtr()));
+ 		CComBSTR p = self[ATTRID_PARVERSION];
+ 
+ 		*pVal=p.Detach();
+ 	}
+ 	COMCATCH(;)
+ }
+ 
  STDMETHODIMP CMgaProject::get_GUID(VARIANT *pVal)
  {
***************
*** 812,815 ****
--- 827,845 ----
  }
  
+ STDMETHODIMP CMgaProject::put_Version(BSTR newVal)
+ {
+ 
+ 	COMTRY_IN_TRANSACTION {
+ 		CHECK_INSTRPAR(newVal);
+ 		CoreObj self;
+ 		COMTHROW(dataproject->get_RootObject(&self.ComPtr()));
+ 		self[ATTRID_VERSION] = newVal;
+ 		notifyqueueprocessed = true;
+ 		COMTHROW(GlobalNotify(GLOBALEVENT_PROJECT_PROPERTIES));
+     }
+     COMCATCH_IN_TRANSACTION(;);
+ }
+ 
+ 
  STDMETHODIMP CMgaProject::get_Name(BSTR *pVal)
  {
***************
*** 820,823 ****
--- 850,866 ----
  		COMTHROW(dataproject->get_RootObject(&self.ComPtr()));
  		CComBSTR s = self[ATTRID_NAME];
+ 		*pVal = s.Detach();
+     }
+     COMCATCH(;);
+ }
+ 
+ STDMETHODIMP CMgaProject::get_Version(BSTR *pVal)
+ {
+ 
+ 	COMTRY {
+ 		CHECK_OUTSTRPAR(pVal);
+ 		CoreObj self;
+ 		COMTHROW(dataproject->get_RootObject(&self.ComPtr()));
+ 		CComBSTR s = self[ATTRID_VERSION];
  		*pVal = s.Detach();
      }

Index: MgaProject.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Mga/MgaProject.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** MgaProject.h	2 Jun 2004 21:43:19 -0000	1.23
--- MgaProject.h	19 Jul 2004 07:01:00 -0000	1.24
***************
*** 128,131 ****
--- 128,133 ----
  	STDMETHOD(get_Name)(BSTR *pVal);
  	STDMETHOD(put_Name)(BSTR newVal);
+ 	STDMETHOD(get_Version)(BSTR *pVal);
+ 	STDMETHOD(put_Version)(BSTR newVal);
  	STDMETHOD(get_Comment)(/**/ BSTR *pVal);
  	STDMETHOD(put_Comment)(/**/ BSTR newVal);
***************
*** 135,138 ****
--- 137,141 ----
  	STDMETHOD(get_CreateTime)( BSTR *pVal);
  	STDMETHOD(get_MetaGUID)(VARIANT *pVal);
+ 	STDMETHOD(get_MetaVersion)(BSTR *pVal);
  	STDMETHOD(get_MetaName)(BSTR *pVal);
  	STDMETHOD(get_GUID)(VARIANT *pVal);

More information about the GME-commit mailing list