[GME-commit] GMESRC/GME/Parser MgaDumper.cpp,1.17,1.18 MgaParser.cpp,1.21,1.22 MgaParser.h,1.7,1.8 mga.dtd,1.8,1.9

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

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

Modified Files:
	MgaDumper.cpp MgaParser.cpp MgaParser.h mga.dtd 
Log Message:
Introduced version and metaversion attributes for MGA projects

CVS User: volgy

Index: MgaDumper.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MgaDumper.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MgaDumper.cpp	14 Jul 2004 19:30:15 -0000	1.17
--- MgaDumper.cpp	19 Jul 2004 07:01:00 -0000	1.18
***************
*** 446,449 ****
--- 446,450 ----
  	Attr("cdate", project, IMgaProject::get_CreateTime);
  	Attr("mdate", project, IMgaProject::get_ChangeTime);
+ 	Attr("version", project, IMgaProject::get_Version);
  
  	CComObjPtr<IMgaMetaProject> metaproject;
***************
*** 457,461 ****
--- 458,465 ----
  	CopyTo(guid, PutOut(bstr));
  	Attr("metaguid", bstr);
+ 	Attr("metaversion", metaproject, IMgaMetaProject::get_Version);
  	Attr("metaname", metaproject, IMgaMetaProject::get_Name);
+ 	
+ 
  
  	StartElem("name");

Index: MgaParser.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MgaParser.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MgaParser.cpp	14 Jul 2004 19:30:15 -0000	1.21
--- MgaParser.cpp	19 Jul 2004 07:01:00 -0000	1.22
***************
*** 243,252 ****
  }
  
! STDMETHODIMP CMgaParser::GetXMLInfo(BSTR filename, BSTR *paradigm, VARIANT *parguid, BSTR* basename) {
  
  //	CHECK_IN(filename);
  	CHECK_OUT(paradigm);
  	CHECK_OUT(parguid);
  	CHECK_OUT(basename);
  
  	try
--- 243,254 ----
  }
  
! STDMETHODIMP CMgaParser::GetXMLInfo(BSTR filename, BSTR *paradigm, BSTR* parversion, VARIANT *parguid, BSTR* basename, BSTR* version) {
  
  //	CHECK_IN(filename);
  	CHECK_OUT(paradigm);
+ 	CHECK_OUT(parversion);
  	CHECK_OUT(parguid);
  	CHECK_OUT(basename);
+ 	CHECK_OUT(version);
  
  	try
***************
*** 281,286 ****
--- 283,290 ----
  
  			infoparname = paradigm;
+ 			infoparversion = parversion;
  			infoparguid = parguid;
  			infoprojname = basename;
+ 			infoversion = version;
  
  			parser.parse(xmlfile.c_str());
***************
*** 1463,1466 ****
--- 1467,1489 ----
  
  		}
+ 
+ 		if( i->first == "metaversion" )
+ 		{
+ 			CComBstrObj bstr;
+ 			CopyTo(i->second, bstr);
+ 
+ 			*infoparversion = bstr.Detach();
+ 
+ 		}
+ 
+ 		if( i->first == "version" )
+ 		{
+ 			CComBstrObj bstr;
+ 			CopyTo(i->second, bstr);
+ 
+ 			*infoversion = bstr.Detach();
+ 
+ 		}
+ 
  
  		++i;

Index: MgaParser.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MgaParser.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MgaParser.h	13 Nov 2001 20:47:00 -0000	1.7
--- MgaParser.h	19 Jul 2004 07:01:00 -0000	1.8
***************
*** 38,42 ****
  
  public:
! 	STDMETHOD(GetXMLInfo)(BSTR filename, BSTR *paradigm, VARIANT *parguid, BSTR* basename);
  	STDMETHOD(ParseFCOs)(IMgaObject *p, BSTR filename);
  	STDMETHOD(ParseProject)(IMgaProject *p, BSTR filename);
--- 38,42 ----
  
  public:
! 	STDMETHOD(GetXMLInfo)(BSTR filename, BSTR *paradigm, BSTR* parversion, VARIANT *parguid, BSTR* basename, BSTR* version);
  	STDMETHOD(ParseFCOs)(IMgaObject *p, BSTR filename);
  	STDMETHOD(ParseProject)(IMgaProject *p, BSTR filename);
***************
*** 91,96 ****
--- 91,98 ----
  
  	BSTR *infoparname;
+ 	BSTR *infoparversion;
  	VARIANT *infoparguid;
  	BSTR *infoprojname;
+ 	BSTR *infoversion;
  
  	long project_prefs, project_prefs_orig;

Index: mga.dtd
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/mga.dtd,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mga.dtd	14 Jul 2004 19:30:15 -0000	1.8
--- mga.dtd	19 Jul 2004 07:01:00 -0000	1.9
***************
*** 1,3 ****
! <?xml version="1.0" encoding="UTF-8"?>
  
  <!ENTITY lt     "&#38;#60;">
--- 1,3 ----
! <?xml version="1.0" encoding="UTF-8"?>
  
  <!ENTITY lt     "&#38;#60;">
***************
*** 9,15 ****
--- 9,17 ----
  <!ELEMENT project (name, comment?, author?, folder)>
  <!ATTLIST project
+ 	version		CDATA		#IMPLIED
  	guid		CDATA		#IMPLIED
  	cdate		CDATA		#IMPLIED
  	mdate		CDATA		#IMPLIED
+ 	metaversion	CDATA		#IMPLIED
  	metaguid	CDATA		#IMPLIED
  	metaname	CDATA		#REQUIRED